# HG changeset patch # User nemo # Date 1318278188 14400 # Node ID 895115acb8c53e3424b1318d329cc1694168b2df # Parent 85d99bbe074c1b242163d8f37f863dbb536040ea Make sticky mines and normal mines start their typical behaviour a second after creation in infinite attack mode. diff -r 85d99bbe074c -r 895115acb8c5 hedgewars/GSHandlers.inc --- a/hedgewars/GSHandlers.inc Mon Oct 10 15:45:19 2011 -0400 +++ b/hedgewars/GSHandlers.inc Mon Oct 10 16:23:08 2011 -0400 @@ -1930,7 +1930,7 @@ dec(Gear^.Timer); end else // gsttmpFlag = 0 - if (TurnTimeLeft = 0) or ((GameFlags and gfInfAttack) <> 0) then Gear^.State := Gear^.State or gsttmpFlag; + if (TurnTimeLeft = 0) or ((GameFlags and gfInfAttack <> 0) and (GameTicks > Gear^.FlightTime + 1000)) then Gear^.State := Gear^.State or gsttmpFlag; end; //////////////////////////////////////////////////////////////////////////////// @@ -1977,7 +1977,7 @@ end end else // gsttmpFlag = 0 - if TurnTimeLeft = 0 then Gear^.State := Gear^.State or gsttmpFlag; + if (TurnTimeLeft = 0) or ((GameFlags and gfInfAttack <> 0) and (GameTicks > Gear^.FlightTime + 1000)) then Gear^.State := Gear^.State or gsttmpFlag; end; //////////////////////////////////////////////////////////////////////////////// diff -r 85d99bbe074c -r 895115acb8c5 hedgewars/HHHandlers.inc --- a/hedgewars/HHHandlers.inc Mon Oct 10 15:45:19 2011 -0400 +++ b/hedgewars/HHHandlers.inc Mon Oct 10 16:23:08 2011 -0400 @@ -373,6 +373,7 @@ amResurrector, amStructure, amTardis: CurAmmoGear:= newGear; end; + if (CurAmmoType = amMine) or (CurAmmoType = amSMine) and (GameFlags and gfInfAttack <> 0) then newGear^.FlightTime:= GameTicks; if Ammoz[CurAmmoType].Ammo.Propz and ammoprop_NeedTarget <> 0 then begin newGear^.Target.X:= TargetPoint.X;