InputMapper::IsButtonDown -> IsBeingPressed, to match InputFilter::IsBeingPressed

This commit is contained in:
Glenn Maynard
2006-09-08 02:12:30 +00:00
parent 18b047fd94
commit ec3b9382d2
10 changed files with 33 additions and 30 deletions
+6 -6
View File
@@ -794,8 +794,8 @@ void ScreenOptions::MenuStart( const InputEventPlus &input )
case NAV_TOGGLE_THREE_KEY:
{
bool bHoldingLeftAndRight =
INPUTMAPPER->IsButtonDown( MenuInput(pn, MENU_BUTTON_RIGHT) ) &&
INPUTMAPPER->IsButtonDown( MenuInput(pn, MENU_BUTTON_LEFT) );
INPUTMAPPER->IsBeingPressed( MenuInput(pn, MENU_BUTTON_RIGHT) ) &&
INPUTMAPPER->IsBeingPressed( MenuInput(pn, MENU_BUTTON_LEFT) );
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->IsButtonDown(MenuInput(pn, MENU_BUTTON_UP)) ||
INPUTMAPPER->IsButtonDown(MenuInput(pn, MENU_BUTTON_SELECT)) )
if( INPUTMAPPER->IsBeingPressed(MenuInput(pn, MENU_BUTTON_UP)) ||
INPUTMAPPER->IsBeingPressed(MenuInput(pn, MENU_BUTTON_SELECT)) )
return;
}
else
{
if( INPUTMAPPER->IsButtonDown(MenuInput(pn, MENU_BUTTON_DOWN)) ||
INPUTMAPPER->IsButtonDown(MenuInput(pn, MENU_BUTTON_START)) )
if( INPUTMAPPER->IsBeingPressed(MenuInput(pn, MENU_BUTTON_DOWN)) ||
INPUTMAPPER->IsBeingPressed(MenuInput(pn, MENU_BUTTON_START)) )
return;
}
}