# HG changeset patch # User nemo # Date 1246811825 0 # Node ID e35b62cb7a1cdbcfa4f26580cde8830308abda3a # Parent 162d8f6bca256fcfe71ef01f30da2b77e66f8dbf Try turning off follow gear while ammo menu is open - needs testing w/ rope/parachute/jetpack diff -r 162d8f6bca25 -r e35b62cb7a1c hedgewars/GSHandlers.inc --- 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) diff -r 162d8f6bca25 -r e35b62cb7a1c hedgewars/uWorld.pas --- 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