# HG changeset patch # User nemo # Date 1286768484 14400 # Node ID 25b0a62e08de7051d731f81d13c4cb0b22905654 # Parent 604f08c54a01aec22779310ceb511b59c7222c86 restore the delay between shots diff -r 604f08c54a01 -r 25b0a62e08de hedgewars/HHHandlers.inc --- a/hedgewars/HHHandlers.inc Sun Oct 10 22:18:38 2010 -0400 +++ b/hedgewars/HHHandlers.inc Sun Oct 10 23:41:24 2010 -0400 @@ -326,7 +326,10 @@ begin OnUsedAmmo(CurrentHedgehog^); if ((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_NoRoundEndHint) = 0) and ((GameFlags and gfInfAttack) = 0) then + begin TurnTimeLeft:= Ammoz[CurAmmoType].TimeAfterTurn; + State:= State or gstAttacked + end; if (Ammoz[CurAmmoType].Ammo.Propz and ammoprop_NoRoundEndHint) <> 0 then ApplyAmmoChanges(CurrentHedgehog^); if (GameFlags and gfInfAttack) <> 0 then State:= State or gstAttacked end; diff -r 604f08c54a01 -r 25b0a62e08de hedgewars/uGears.pas --- a/hedgewars/uGears.pas Sun Oct 10 22:18:38 2010 -0400 +++ b/hedgewars/uGears.pas Sun Oct 10 23:41:24 2010 -0400 @@ -848,15 +848,17 @@ if delay2 = 0 then delay2:= cInactDelay * 4 else + begin dec(delay2); - if ((delay2 mod cInactDelay) = 0) and (CurrentHedgehog <> nil) and (CurrentHedgehog^.Gear <> nil) then - CurrentHedgehog^.Gear^.State:= CurrentHedgehog^.Gear^.State and not gstAttacked; - if delay2 = 0 then - begin - SweepDirty; - CheckNoDamage; - CheckForWin + if ((delay2 mod cInactDelay) = 0) and (CurrentHedgehog <> nil) and (CurrentHedgehog^.Gear <> nil) then + CurrentHedgehog^.Gear^.State:= CurrentHedgehog^.Gear^.State and not gstAttacked; + if delay2 = 0 then + begin + SweepDirty; + CheckNoDamage; + CheckForWin + end end end;