diff -r 05f003ad3caa -r 6f5842bc481b hedgewars/HHHandlers.inc --- a/hedgewars/HHHandlers.inc Fri Jun 27 17:22:15 2008 +0000 +++ b/hedgewars/HHHandlers.inc Fri Jun 27 17:45:35 2008 +0000 @@ -480,6 +480,15 @@ else Gear^.Message:= 0; +if (TurnTimeLeft = 0) or (Gear^.Damage > 0) then + begin + TurnTimeLeft:= 0; + Gear^.State:= Gear^.State and not (gstHHDriven or gstAnimation); + if Gear^.Damage > 0 then + Gear^.State:= Gear^.State and not (gstHHJumping or gstHHHJump); + exit + end; + if (Gear^.State and gstAnimation) <> 0 then begin Gear^.Message:= 0; @@ -494,16 +503,6 @@ exit end; - -if (TurnTimeLeft = 0) or (Gear^.Damage > 0) then - begin - TurnTimeLeft:= 0; - Gear^.State:= Gear^.State and not gstHHDriven; - if Gear^.Damage > 0 then - Gear^.State:= Gear^.State and not (gstHHJumping or gstHHHJump); - exit - end; - if ((Gear^.State and gstMoving) <> 0) or (StepTicks = cHHStepTicks) or (CurAmmoGear <> nil) then // we're moving