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.
fixed gfInfAttack preventing ending of turn while placing hedgehogs
authorHenek
Wed, 22 Jun 2011 01:04:38 +0200
changeset 5287 ffc1475a4afd
parent 5285 af4dc03dd60d
child 5289 9d18b61bd3eb
child 5290 eea7570d345f
fixed gfInfAttack preventing ending of turn while placing hedgehogs
hedgewars/HHHandlers.inc file | annotate | diff | comparison | revisions 
--- a/hedgewars/HHHandlers.inc	Tue Jun 21 18:28:34 2011 -0400
+++ b/hedgewars/HHHandlers.inc	Wed Jun 22 01:04:38 2011 +0200
@@ -380,7 +380,7 @@
         else
             begin
             OnUsedAmmo(CurrentHedgehog^);
-            if ((Ammoz[a].Ammo.Propz and ammoprop_NoRoundEnd) = 0) and ((GameFlags and gfInfAttack) = 0) then
+            if ((Ammoz[a].Ammo.Propz and ammoprop_NoRoundEnd) = 0) and (((GameFlags and gfInfAttack) = 0) or PlacingHogs) then
                 begin
                 if TagTurnTimeLeft = 0 then TagTurnTimeLeft:= TurnTimeLeft;
                 TurnTimeLeft:=(Ammoz[a].TimeAfterTurn * cGetAwayTime) div 100;
hedgewars