# HG changeset patch # User Wuzzy # Date 1547141414 -3600 # Node ID 42f7ce0f5bc69a62abf5a6b9daaf0c08f6713c9d # Parent ed90b5e2545b8e7b0250f10fc102bf31de126059 Minor touch refactor diff -r ed90b5e2545b -r 42f7ce0f5bc6 hedgewars/uWorld.pas --- a/hedgewars/uWorld.pas Thu Jan 10 18:08:02 2019 +0100 +++ b/hedgewars/uWorld.pas Thu Jan 10 18:30:14 2019 +0100 @@ -42,6 +42,7 @@ procedure MoveCamera; procedure onFocusStateChanged; procedure updateCursorVisibility; +procedure updateTouchWidgets(ammoType: TAmmoType); implementation uses @@ -781,23 +782,7 @@ SetWeapon(Ammo^[Slot, Pos].AmmoType); bSelected:= false; FreeAndNilTexture(WeaponTooltipTex); -{$IFDEF USE_TOUCH_INTERFACE}//show the aiming buttons + animation - if (Ammo^[Slot, Pos].Propz and ammoprop_NeedUpDown) <> 0 then - begin - if (not arrowUp.show) then - begin - animateWidget(@arrowUp, true, true); - animateWidget(@arrowDown, true, true); - end; - end - else - if arrowUp.show then - begin - animateWidget(@arrowUp, true, false); - animateWidget(@arrowDown, true, false); - end; - SetUtilityWidgetState(Ammo^[Slot, Pos].AmmoType); -{$ENDIF} + updateTouchWidgets(Ammo^[Slot, Pos].AmmoType); exit end; end @@ -2129,6 +2114,30 @@ SDL_ShowCursor(ord(GameState = gsConfirm)) end; +procedure updateTouchWidgets(ammoType: TAmmoType); +begin +{$IFDEF USE_TOUCH_INTERFACE} +//show the aiming buttons + animation +if (Ammoz[ammoType].Ammo.Propz and ammoprop_NeedUpDown) <> 0 then + begin + if (not arrowUp.show) then + begin + animateWidget(@arrowUp, true, true); + animateWidget(@arrowDown, true, true); + end; + end +else + if arrowUp.show then + begin + animateWidget(@arrowUp, true, false); + animateWidget(@arrowDown, true, false); + end; +SetUtilityWidgetState(ammoType); +{$ELSE} +ammoType:= ammoType; // avoid hint +{$ENDIF} +end; + procedure SetUtilityWidgetState(ammoType: TAmmoType); begin {$IFDEF USE_TOUCH_INTERFACE}