diff -r 44d2dc3b438f -r e529b28d10e9 hedgewars/HHHandlers.inc
--- a/hedgewars/HHHandlers.inc	Mon Sep 19 14:17:33 2011 -0400
+++ b/hedgewars/HHHandlers.inc	Mon Sep 19 23:25:13 2011 +0200
@@ -1077,13 +1077,13 @@
 if ((Gear^.State and gstWait) = 0) and
     (prevState <> Gear^.State) then
     begin
-    Gear^.State:= gstWait;
+    Gear^.State:= Gear^.State or gstWait;
     Gear^.Timer:= 150
     end else
     begin
     if Gear^.Timer = 0 then
         begin
-        Gear^.State:= 0;
+        Gear^.State:= Gear^.State and not gstWait;
         Gear^.Active:= false;
         AddGearCI(Gear);
         exit
@@ -1107,7 +1107,9 @@
 else
     begin
     with Gear^.Hedgehog^ do
-        if Team^.hasGone then TeamGoneEffect(Team^);
-    doStepHedgehogDriven(Gear)
+        if Team^.hasGone then
+            TeamGoneEffect(Team^)
+        else
+            doStepHedgehogDriven(Gear)
     end;
 end;