# HG changeset patch # User nemo # Date 1386090651 18000 # Node ID 419e5c651870cf3ccfaa06a6d85dd1cf61f3cb58 # Parent cf086f49516b72dafc6638eaaab7cb88fb86d862 Remove turntimeleft/hog gear check from smine if infinite attack is enabled. just use the flightime for that. diff -r cf086f49516b -r 419e5c651870 hedgewars/uGearsHandlersMess.pas --- a/hedgewars/uGearsHandlersMess.pas Tue Dec 03 17:39:07 2013 +0100 +++ b/hedgewars/uGearsHandlersMess.pas Tue Dec 03 12:10:51 2013 -0500 @@ -1731,24 +1731,23 @@ Gear^.State := Gear^.State or gstAttacking end else // gstAttacking <> 0 - begin + begin AllInactive := false; if Gear^.Timer = 0 then begin doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 30, Gear^.Hedgehog, EXPLAutoSound); DeleteGear(Gear); exit - end else + end + else if (Gear^.Timer and $FF) = 0 then PlaySound(sndMineTick); - - dec(Gear^.Timer); + dec(Gear^.Timer); end - end + end else // gsttmpFlag = 0 - if (TurnTimeLeft = 0) - or ((GameFlags and gfInfAttack <> 0) and (GameTicks > Gear^.FlightTime)) - or (Gear^.Hedgehog^.Gear = nil) then + if ((GameFlags and gfInfAttack = 0) and ((TurnTimeLeft = 0) or (Gear^.Hedgehog^.Gear = nil))) + or ((GameFlags and gfInfAttack <> 0) and (GameTicks > Gear^.FlightTime)) then Gear^.State := Gear^.State or gsttmpFlag; end;