--- a/hedgewars/uWorld.pas	Sun Mar 18 14:22:13 2012 +0100
+++ b/hedgewars/uWorld.pas	Sun Mar 18 18:19:20 2012 +0100
@@ -502,20 +502,25 @@
 {$ENDIF}
     AMShiftTargetX:= (cScreenWidth shr 1) - AmmoRect.x;
     AMShiftTargetY:= cScreenHeight        - AmmoRect.y;
-(*
+
     if (AMAnimType and AMTypeMaskX) <> 0 then AMShiftTargetX:= (cScreenWidth shr 1) - AmmoRect.x
     else AMShiftTargetX:= 0;
     if (AMAnimType and AMTypeMaskY) <> 0 then AMShiftTargetY:= cScreenHeight        - AmmoRect.y
     else AMShiftTargetY:= 0;
-*)
+
     AMShiftX:= AMShiftTargetX;
     AMShiftY:= AMShiftTargetY;
 end;
 
 AMAnimState:= (RealTicks - AMAnimStartTime) / AMAnimDuration;
+
+if AMState = AMShowing then
+    begin
+    FollowGear:=nil;
+    end;
+
 if AMState = AMShowingUp then // show ammo menu
     begin
-    FollowGear:= nil;
     if (cReducedQuality and rqSlowMenu) <> 0 then
         begin
         AMShiftX:= 0;
@@ -1555,7 +1560,7 @@
 if ((CursorPoint.X = prevPoint.X) and (CursorPoint.Y = prevpoint.Y)) then
     exit;
 
-if (AMShiftX <> AMShiftTargetX) and (AMShiftY <> AMShiftTargetY) then
+if (AMState = AMShowingUp) or (AMState = AMShowing) then
 begin
     if CursorPoint.X < AmmoRect.x then//check left 
         CursorPoint.X:= AmmoRect.x;