--- a/hedgewars/GSHandlers.inc	Thu Sep 10 04:36:58 2009 +0000
+++ b/hedgewars/GSHandlers.inc	Thu Sep 10 07:48:30 2009 +0000
@@ -41,7 +41,11 @@
         CheckGearDrowning:= true;
         Gear^.State:= gstDrowning;
         Gear^.doStep:= @doStepDrowningGear;
-		if Gear^.Kind = gtHedgehog then AddCaption(Format(GetEventString(eidDrowned), PHedgehog(Gear^.Hedgehog)^.Name), $FFFFFF, capgrpMessage);
+		if Gear^.Kind = gtHedgehog then
+			begin
+			Gear^.State:= Gear^.State and (not gstHHDriven);
+			AddCaption(Format(GetEventString(eidDrowned), PHedgehog(Gear^.Hedgehog)^.Name), $FFFFFF, capgrpMessage);
+			end
         end;
     PlaySound(sndSplash, false, nil)
     end