# HG changeset patch # User nemo # Date 1319075619 14400 # Node ID 930c3be58e1e0896b19aa273b7cca9d0327a29d3 # Parent 72c6239a7cc6ccee45675c7dc920346e5c343c60 Fix sticky mine/mine activation bug diff -r 72c6239a7cc6 -r 930c3be58e1e hedgewars/GSHandlers.inc --- a/hedgewars/GSHandlers.inc Wed Oct 19 21:50:03 2011 -0400 +++ b/hedgewars/GSHandlers.inc Wed Oct 19 21:53:39 2011 -0400 @@ -1930,7 +1930,7 @@ dec(Gear^.Timer); end else // gsttmpFlag = 0 - if (TurnTimeLeft = 0) or ((GameFlags and gfInfAttack <> 0) and (GameTicks > Gear^.FlightTime)) then Gear^.State := Gear^.State or gsttmpFlag; + if (TurnTimeLeft = 0) or ((GameFlags and gfInfAttack <> 0) and (GameTicks > Gear^.FlightTime)) or (Gear^.Hedgehog^.Gear = nil) then Gear^.State := Gear^.State or gsttmpFlag; end; //////////////////////////////////////////////////////////////////////////////// @@ -1977,8 +1977,7 @@ end end else // gsttmpFlag = 0 - if (TurnTimeLeft = 0) or ((GameFlags and gfInfAttack <> 0) and (GameTicks > Gear^.FlightTime)) then - Gear^.State := Gear^.State or gsttmpFlag; + if (TurnTimeLeft = 0) or ((GameFlags and gfInfAttack <> 0) and (GameTicks > Gear^.FlightTime)) or (Gear^.Hedgehog^.Gear = nil) then Gear^.State := Gear^.State or gsttmpFlag; end; ////////////////////////////////////////////////////////////////////////////////