Hopefully fix bee/air attacks w/o screwing anything else up. Set mines to trigger immediately in infinite attack mode (better not use 0s mines)
authornemo
Sun, 10 Oct 2010 20:34:48 -0400
changeset 3953 fd7ced2071a1
parent 3951 c9a63db3e603
child 3954 ae3583ad6ea9
Hopefully fix bee/air attacks w/o screwing anything else up. Set mines to trigger immediately in infinite attack mode (better not use 0s mines)
hedgewars/GSHandlers.inc
hedgewars/HHHandlers.inc
--- a/hedgewars/GSHandlers.inc	Sun Oct 10 20:16:17 2010 -0400
+++ b/hedgewars/GSHandlers.inc	Sun Oct 10 20:34:48 2010 -0400
@@ -1456,7 +1456,7 @@
         dec(Gear^.Timer);
     end
     else // gsttmpFlag = 0
-        if TurnTimeLeft = 0 then Gear^.State := Gear^.State or gsttmpFlag;
+        if (TurnTimeLeft = 0) or ((GameFlags and gfInfAttack) <> 0) then Gear^.State := Gear^.State or gsttmpFlag;
 end;
 
 ////////////////////////////////////////////////////////////////////////////////
--- a/hedgewars/HHHandlers.inc	Sun Oct 10 20:16:17 2010 -0400
+++ b/hedgewars/HHHandlers.inc	Sun Oct 10 20:34:48 2010 -0400
@@ -326,11 +326,9 @@
             begin
             OnUsedAmmo(CurrentHedgehog^);
             if ((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_NoRoundEndHint) = 0) and ((GameFlags and gfInfAttack) = 0) then
-                begin
                 TurnTimeLeft:= Ammoz[CurAmmoType].TimeAfterTurn;
-                end
-            else ApplyAmmoChanges(CurrentHedgehog^);
-            if (GameFlags and gfInfAttack) <> 0 then State:= State or gstAttacked;
+            if (Ammoz[CurAmmoType].Ammo.Propz and ammoprop_NoRoundEndHint) <> 0 then ApplyAmmoChanges(CurrentHedgehog^);
+            if (GameFlags and gfInfAttack) <> 0 then State:= State or gstAttacked
             end;
         end
     else