fixed #536: Gamepad: zooming with buttons needs several clicking

Tobias Zwick 2010-12-15 02:16:24 +01:00
parent ddcc976c05
commit 24847bb014
2 changed files with 6 additions and 2 deletions

View File

@ -441,12 +441,16 @@
GUIName=Zoom in
GUIDesc=Increase viewport zoom
Action=ZoomIn
Hold=1
RepeatDelay=3
[ControlDef]
Identifier=ZoomOut
GUIName=Zoom out
GUIDesc=Decrease viewport zoom
Action=ZoomOut
Hold=1
RepeatDelay=3

View File

@ -977,8 +977,8 @@ bool C4PlayerControl::ExecuteControlAction(int32_t iControl, C4PlayerControlDef:
case C4PlayerControlDef::CDA_ObjectMenuRight: if (!pCursorMenu || fUp) return false; pCursorMenu->Control(COM_MenuRight,0); return true; // navigate
case C4PlayerControlDef::CDA_ObjectMenuDown: if (!pCursorMenu || fUp) return false; pCursorMenu->Control(COM_MenuDown ,0); return true; // navigate
case C4PlayerControlDef::CDA_ZoomIn: if (!pPlr || !(pVP = ::Viewports.GetViewport(iPlr))) return false; pVP->ChangeZoom(C4GFX_ZoomStep); return true; // viewport zoom
case C4PlayerControlDef::CDA_ZoomOut: if (!pPlr || !(pVP = ::Viewports.GetViewport(iPlr))) return false; pVP->ChangeZoom(1.0f/C4GFX_ZoomStep); return true; // viewport zoom
case C4PlayerControlDef::CDA_ZoomIn: if (!pPlr || fUp || !(pVP = ::Viewports.GetViewport(iPlr))) return false; pVP->ChangeZoom(C4GFX_ZoomStep); return true; // viewport zoom
case C4PlayerControlDef::CDA_ZoomOut: if (!pPlr || fUp || !(pVP = ::Viewports.GetViewport(iPlr))) return false; pVP->ChangeZoom(1.0f/C4GFX_ZoomStep); return true; // viewport zoom
//unknown action
default: return false;