--- a/hedgewars/GSHandlers.inc	Sun May 03 21:12:34 2009 +0000
+++ b/hedgewars/GSHandlers.inc	Sun May 03 21:28:15 2009 +0000
@@ -773,8 +773,7 @@
 	with HHGear^ do
 		begin
 		Message:= Message and not gm_Attack;
-		State:= State or gstMoving;
-		State:= State and not gstWinner;
+		State:= (State or gstMoving) and not gstWinner;
 		end;
 	DeleteGear(Gear)
 	end;
@@ -954,7 +953,7 @@
 	begin
 	CheckHHDamage(HHGear);
 	HHGear^.dY:= _0;
-	HHGear^.State:= HHGear^.State and not (gstMoving or gstHHJumping);
+	HHGear^.State:= HHGear^.State and not (gstMoving or gstHHJumping or gstHHHJump);
 	end else
 	begin
 	if TestCollisionXwithGear(HHGear, hwSign(HHGear^.dX)) then SetLittle(HHGear^.dX);