not sure why this condition wasn't here before
authornemo
Sat, 05 Nov 2011 21:01:21 -0400
changeset 6296 0cd63375e80b
parent 6295 5b2b304a91ec
child 6297 f2942ea53e53
not sure why this condition wasn't here before
hedgewars/uWorld.pas
--- a/hedgewars/uWorld.pas	Sat Nov 05 20:51:15 2011 -0400
+++ b/hedgewars/uWorld.pas	Sat Nov 05 21:01:21 2011 -0400
@@ -1206,21 +1206,21 @@
     uCursor.updatePosition();
 {$ENDIF}
 z:= round(200/zoom);
-if (not PlacingHogs) and (FollowGear <> nil) and (not isCursorVisible) and (not fastUntilLag) then
+if not PlacingHogs and (FollowGear <> nil) and not isCursorVisible and not bShowAmmoMenu and not fastUntilLag then
     if (not autoCameraOn) or ((abs(CursorPoint.X - prevPoint.X) + abs(CursorPoint.Y - prevpoint.Y)) > 4) then
-    begin
+        begin
         FollowGear:= nil;
         prevPoint:= CursorPoint;
         exit
-    end
+        end
     else
-    begin
+        begin
         CursorPoint.X:= (prevPoint.X * 7 + hwRound(FollowGear^.X) + hwSign(FollowGear^.dX) * z + WorldDx) div 8;
         if isPhone() or (cScreenHeight < 600) or ((hwSign(FollowGear^.dY) * z) < 10)  then
             CursorPoint.Y:= (prevPoint.Y * 7 + cScreenHeight - (hwRound(FollowGear^.Y) + WorldDy)) div 8
         else
             CursorPoint.Y:= (prevPoint.Y * 7 + cScreenHeight - (hwRound(FollowGear^.Y) + hwSign(FollowGear^.dY) * z + WorldDy)) div 8;
-    end;
+        end;
 
 wdy:= trunc(cScreenHeight / cScaleFactor) + cScreenHeight div 2 - cWaterLine - cVisibleWater;
 if WorldDy < wdy then WorldDy:= wdy;