# HG changeset patch # User Xeli # Date 1332091160 -3600 # Node ID 8701007d58c0146a8b16070f8efcfbb89d525a31 # Parent b42bdf470b840fab1549c964ae895d09695f40ab fix ammomenu, the cursor actually works now -_- diff -r b42bdf470b84 -r 8701007d58c0 hedgewars/uWorld.pas --- 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; diff -r b42bdf470b84 -r 8701007d58c0 project_files/Android-build/SDL-android-project/assets/Data/Graphics/Buttons/backjump.png Binary file project_files/Android-build/SDL-android-project/assets/Data/Graphics/Buttons/backjump.png has changed