diff -r 1a26c472f5ef -r 52959f686082 hedgewars/uGearsHedgehog.pas --- a/hedgewars/uGearsHedgehog.pas Mon Sep 03 00:53:44 2018 +0200 +++ b/hedgewars/uGearsHedgehog.pas Mon Sep 03 01:09:14 2018 +0200 @@ -638,10 +638,13 @@ begin if TagTurnTimeLeft = 0 then TagTurnTimeLeft:= TurnTimeLeft; - if (CurAmmoGear <> nil) and (CurAmmoGear^.State and gstSubmersible <> 0) and CheckCoordInWater(hwRound(CurAmmoGear^.X), hwRound(CurAmmoGear^.Y)) then - TurnTimeLeft:=(Ammoz[a].TimeAfterTurn * cGetAwayTime) div 25 - else TurnTimeLeft:=(Ammoz[a].TimeAfterTurn * cGetAwayTime) div 100; - IsGetAwayTime := true; + if (HHGear^.State and gstHHDriven) <> 0 then + begin + if (CurAmmoGear <> nil) and (CurAmmoGear^.State and gstSubmersible <> 0) and CheckCoordInWater(hwRound(CurAmmoGear^.X), hwRound(CurAmmoGear^.Y)) then + TurnTimeLeft:=(Ammoz[a].TimeAfterTurn * cGetAwayTime) div 25 + else TurnTimeLeft:=(Ammoz[a].TimeAfterTurn * cGetAwayTime) div 100; + IsGetAwayTime := true; + end; end; if ((Ammoz[a].Ammo.Propz and ammoprop_NoRoundEnd) = 0) and (HHGear <> nil) then HHGear^.State:= HHGear^.State or gstAttacked;