actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

simplify

Browse Source
This commit is contained in:
Glenn Maynard
2006-09-14 04:07:52 +00:00
parent b112d10e41
commit 516c759d12
4 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenOptions.cpp
+9 -9
View File
@@ -503,9 +503,9 @@ void ScreenOptions::Input( const InputEventPlus &input )
case MENU_BUTTON_SELECT:
case MENU_BUTTON_RIGHT:
case MENU_BUTTON_LEFT:
INPUTMAPPER->ResetKeyRepeat( MenuInput(input.pn, MENU_BUTTON_START), input.pn );
INPUTMAPPER->ResetKeyRepeat( MenuInput(input.pn, MENU_BUTTON_RIGHT), input.pn );
INPUTMAPPER->ResetKeyRepeat( MenuInput(input.pn, MENU_BUTTON_LEFT), input.pn );
INPUTMAPPER->ResetKeyRepeat( MENU_BUTTON_START, input.pn );
INPUTMAPPER->ResetKeyRepeat( MENU_BUTTON_RIGHT, input.pn );
INPUTMAPPER->ResetKeyRepeat( MENU_BUTTON_LEFT, input.pn );
}
}
@@ -794,8 +794,8 @@ void ScreenOptions::MenuStart( const InputEventPlus &input )
case NAV_TOGGLE_THREE_KEY:
{
bool bHoldingLeftAndRight =
INPUTMAPPER->IsBeingPressed( MenuInput(pn, MENU_BUTTON_RIGHT), pn ) &&
INPUTMAPPER->IsBeingPressed( MenuInput(pn, MENU_BUTTON_LEFT), pn );
INPUTMAPPER->IsBeingPressed( MENU_BUTTON_RIGHT, pn ) &&
INPUTMAPPER->IsBeingPressed( MENU_BUTTON_LEFT, pn );
if( bHoldingLeftAndRight )
{
if( MoveRowRelative(pn, -1, input.type != IET_FIRST_PRESS) )
@@ -1223,14 +1223,14 @@ void ScreenOptions::MenuUpDown( const InputEventPlus &input, int iDir )
* holding both up and down from toggling repeatedly in-place. */
if( iDir == +1 )
{
if( INPUTMAPPER->IsBeingPressed(MenuInput(pn, MENU_BUTTON_UP), pn) ||
INPUTMAPPER->IsBeingPressed(MenuInput(pn, MENU_BUTTON_SELECT), pn) )
if( INPUTMAPPER->IsBeingPressed(MENU_BUTTON_UP, pn) ||
INPUTMAPPER->IsBeingPressed(MENU_BUTTON_SELECT, pn) )
return;
}
else
{
if( INPUTMAPPER->IsBeingPressed(MenuInput(pn, MENU_BUTTON_DOWN), pn) ||
INPUTMAPPER->IsBeingPressed(MenuInput(pn, MENU_BUTTON_START), pn) )
if( INPUTMAPPER->IsBeingPressed(MENU_BUTTON_DOWN, pn) ||
INPUTMAPPER->IsBeingPressed(MENU_BUTTON_START, pn) )
return;
}
}