--- a/hedgewars/GSHandlers.inc	Sun Jul 05 13:44:11 2009 +0000
+++ b/hedgewars/GSHandlers.inc	Sun Jul 05 16:37:05 2009 +0000
@@ -2244,7 +2244,7 @@
 Gear^.X:= HHGear^.X;
 Gear^.Y:= HHGear^.Y;
 // For some reason I need to reapply followgear here, something else grabs it otherwise.
-FollowGear:= HHGear;
+if not bShowAmmoMenu then FollowGear:= HHGear;
 doStepHedgehogMoving(HHGear);
 
 if  (Gear^.Health = 0)

--- a/hedgewars/uWorld.pas	Sun Jul 05 13:44:11 2009 +0000
+++ b/hedgewars/uWorld.pas	Sun Jul 05 16:37:05 2009 +0000
@@ -85,6 +85,7 @@
 if (TurnTimeLeft = 0) or (((CurAmmoGear = nil) or ((CurAmmoGear^.Ammo^.Propz and ammoprop_AltAttack) = 0)) and KbdKeyPressed) then bShowAmmoMenu:= false;
 if bShowAmmoMenu then
    begin
+   FollowGear:= nil;
    if AMxShift = 210 then prevPoint.X:= 0;
    if cReducedQuality then
        AMxShift:= 0