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

input.pn

Browse Source
This commit is contained in:
Glenn Maynard
2006-09-14 04:08:58 +00:00
parent 516c759d12
commit 4d612ff9ee
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenGameplay.cpp
+4 -4
View File
@@ -2064,7 +2064,7 @@ void ScreenGameplay::Input( const InputEventPlus &input )
if( m_bPaused ) if( m_bPaused )
{ {
/* If we're paused, only accept MENU_BUTTON_START to unpause. */ /* If we're paused, only accept MENU_BUTTON_START to unpause. */
if( input.MenuI.IsValid() && GAMESTATE->IsHumanPlayer(input.MenuI.player) && input.MenuI.button == MENU_BUTTON_START && input.type == IET_FIRST_PRESS ) if( input.MenuI.IsValid() && GAMESTATE->IsHumanPlayer(input.pn) && input.MenuI.button == MENU_BUTTON_START && input.type == IET_FIRST_PRESS )
{ {
if( m_PauseController == GAME_CONTROLLER_INVALID || m_PauseController == input.GameI.controller ) if( m_PauseController == GAME_CONTROLLER_INVALID || m_PauseController == input.GameI.controller )
this->PauseGame( false ); this->PauseGame( false );
@@ -2074,7 +2074,7 @@ void ScreenGameplay::Input( const InputEventPlus &input )
if( input.MenuI.IsValid() && if( input.MenuI.IsValid() &&
m_DancingState != STATE_OUTRO && m_DancingState != STATE_OUTRO &&
GAMESTATE->IsHumanPlayer(input.MenuI.player) && GAMESTATE->IsHumanPlayer(input.pn) &&
(!GAMESTATE->m_bMultiplayer || input.mp == MultiPlayer_1) && (!GAMESTATE->m_bMultiplayer || input.mp == MultiPlayer_1) &&
!m_Cancel.IsTransitioning() ) !m_Cancel.IsTransitioning() )
{ {
@@ -2121,7 +2121,7 @@ void ScreenGameplay::Input( const InputEventPlus &input )
(input.DeviceI.device==DEVICE_KEYBOARD && input.type==IET_REPEAT) || (input.DeviceI.device==DEVICE_KEYBOARD && input.type==IET_REPEAT) ||
(input.DeviceI.device!=DEVICE_KEYBOARD && INPUTFILTER->GetSecsHeld(input.DeviceI) >= 1.0f)) ) (input.DeviceI.device!=DEVICE_KEYBOARD && INPUTFILTER->GetSecsHeld(input.DeviceI) >= 1.0f)) )
{ {
LOG->Trace("Player %i went back", input.MenuI.player+1); LOG->Trace("Player %i went back", input.pn+1);
BeginBackingOutFromGameplay(); BeginBackingOutFromGameplay();
} }
else if( PREFSMAN->m_bDelayedBack && input.type==IET_FIRST_PRESS ) else if( PREFSMAN->m_bDelayedBack && input.type==IET_FIRST_PRESS )
@@ -2164,7 +2164,7 @@ void ScreenGameplay::Input( const InputEventPlus &input )
// //
if( input.type==IET_FIRST_PRESS && if( input.type==IET_FIRST_PRESS &&
iCol != Column_INVALID && iCol != Column_INVALID &&
GAMESTATE->IsHumanPlayer( input.MenuI.player ) ) GAMESTATE->IsHumanPlayer( input.pn ) )
{ {
AbortGiveUp( true ); AbortGiveUp( true );