--- a/hedgewars/GSHandlers.inc	Sat Oct 28 12:56:04 2006 +0000
+++ b/hedgewars/GSHandlers.inc	Sat Oct 28 13:18:23 2006 +0000
@@ -880,8 +880,11 @@
 var HHGear: PGear;
 begin
 HHGear:= PHedgehog(Gear.Hedgehog).Gear;
+HHGear.State:= HHGear.State and not gstAttacking;
 
-if TestCollisionYwithGear(HHGear, 1) or ((HHGear.State and gstHHDriven) = 0) then
+if TestCollisionYwithGear(HHGear, 1)
+   or ((HHGear.State and gstHHDriven) = 0)
+   or CheckGearDrowning(HHGear) then
    begin
    with HHGear^ do
         begin