# HG changeset patch
# User nemo
# Date 1246207444 0
# Node ID 29508a2924c21717717ec408f50038fbb82a60c5
# Parent  6b14d6da9a499b1cd808c774f76a414e76ad7c58
Move count notification to all multishoot

diff -r 6b14d6da9a49 -r 29508a2924c2 hedgewars/GSHandlers.inc
--- a/hedgewars/GSHandlers.inc	Sun Jun 28 14:39:18 2009 +0000
+++ b/hedgewars/GSHandlers.inc	Sun Jun 28 16:44:04 2009 +0000
@@ -459,8 +459,6 @@
 
 procedure doStepDEagleShot(Gear: PGear);
 begin
-if Ammoz[amDEagle].Ammo.NumPerTurn>CurrentHedgehog^.AttacksNum then
-    AddCaption(inttostr(Ammoz[amDEagle].Ammo.NumPerTurn-CurrentHedgehog^.AttacksNum)+' '+trmsg[sidRemaining], $FFFFFF, capgrpAmmostate);
 PlaySound(sndGun, false, nil);
 Gear^.doStep:= @doStepBulletWork
 end;
diff -r 6b14d6da9a49 -r 29508a2924c2 hedgewars/HHHandlers.inc
--- a/hedgewars/HHHandlers.inc	Sun Jun 28 14:39:18 2009 +0000
+++ b/hedgewars/HHHandlers.inc	Sun Jun 28 16:44:04 2009 +0000
@@ -237,7 +237,10 @@
 		Inc(AttacksNum);
 		if (Ammo^[CurSlot, CurAmmo].NumPerTurn >= AttacksNum) or
 		((GameFlags and gfMultiWeapon) <> 0) then
+            begin
+            AddCaption(inttostr(Ammo^[CurSlot, CurAmmo].NumPerTurn+1-AttacksNum)+' '+trmsg[sidRemaining], $FFFFFF, capgrpAmmostate);
 			isInMultiShoot:= true
+            end
 		else
 			begin
 			TurnTimeLeft:= Ammoz[Ammo^[CurSlot, CurAmmo].AmmoType].TimeAfterTurn;