Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move count notification to all multishoot
authornemo
Sun, 28 Jun 2009 16:44:04 +0000
changeset 2202 29508a2924c2
parent 2201 6b14d6da9a49
child 2203 6bd39d75e0dd
Move count notification to all multishoot
hedgewars/GSHandlers.inc file | annotate | diff | comparison | revisions
hedgewars/HHHandlers.inc file | annotate | diff | comparison | revisions 
--- 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;
--- 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;
hedgewars