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

MENU_BUTTON_ -> GAME_BUTTON_

Browse Source
This commit is contained in:
Chris Danford
2008-05-21 05:36:09 +00:00
parent f179a6d34b
commit d377c2b1a4
18 changed files with 111 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenGameplay.cpp
+6 -6
View File
@@ -2109,8 +2109,8 @@ void ScreenGameplay::Input( const InputEventPlus &input )
if( m_bPaused )
{
/* If we're paused, only accept MENU_BUTTON_START to unpause. */
if( GAMESTATE->IsHumanPlayer(input.pn) && input.MenuI == MENU_BUTTON_START && input.type == IET_FIRST_PRESS )
/* If we're paused, only accept GAME_BUTTON_START to unpause. */
if( GAMESTATE->IsHumanPlayer(input.pn) && input.MenuI == GAME_BUTTON_START && input.type == IET_FIRST_PRESS )
{
if( m_PauseController == GameController_Invalid || m_PauseController == input.GameI.controller )
this->PauseGame( false );
@@ -2131,8 +2131,8 @@ void ScreenGameplay::Input( const InputEventPlus &input )
bool bHoldingGiveUp = false;
if( GAMESTATE->GetCurrentStyle()->GameInputToColumn(input.GameI) == Column_Invalid )
{
bHoldingGiveUp |= ( START_GIVES_UP && input.MenuI == MENU_BUTTON_START );
bHoldingGiveUp |= ( BACK_GIVES_UP && input.MenuI == MENU_BUTTON_BACK );
bHoldingGiveUp |= ( START_GIVES_UP && input.MenuI == GAME_BUTTON_START );
bHoldingGiveUp |= ( BACK_GIVES_UP && input.MenuI == GAME_BUTTON_BACK );
}
if( bHoldingGiveUp )
@@ -2155,12 +2155,12 @@ void ScreenGameplay::Input( const InputEventPlus &input )
return;
}
/* Only handle MENU_BUTTON_BACK as a regular BACK button if BACK_GIVES_UP is
/* Only handle GAME_BUTTON_BACK as a regular BACK button if BACK_GIVES_UP is
* disabled. */
bool bHoldingBack = false;
if( GAMESTATE->GetCurrentStyle()->GameInputToColumn(input.GameI) == Column_Invalid )
{
bHoldingBack |= input.MenuI == MENU_BUTTON_BACK && !BACK_GIVES_UP;
bHoldingBack |= input.MenuI == GAME_BUTTON_BACK && !BACK_GIVES_UP;
}
if( bHoldingBack )