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

fix ignoring input on inactive players

Browse Source
This commit is contained in:
Glenn Maynard
2004-01-21 06:14:49 +00:00
parent 01577a27f2
commit bb9932029a
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenSelectCourse.cpp
+5 -1
View File
@@ -233,6 +233,11 @@ void ScreenSelectCourse::Input( const DeviceInput& DeviceI, InputEventType type,
if( !GameI.IsValid() ) return; // don't care if( !GameI.IsValid() ) return; // don't care
/* XXX: What's the difference between this and StyleI.player? */
PlayerNumber pn = GAMESTATE->GetCurrentStyleDef()->ControllerToPlayerNumber( GameI.controller );
if( !GAMESTATE->IsHumanPlayer(pn) )
return;
if( m_bMadeChoice && MenuI.IsValid() && MenuI.button == MENU_BUTTON_START && !GAMESTATE->IsExtraStage() && !GAMESTATE->IsExtraStage2() ) if( m_bMadeChoice && MenuI.IsValid() && MenuI.button == MENU_BUTTON_START && !GAMESTATE->IsExtraStage() && !GAMESTATE->IsExtraStage2() )
{ {
if(m_bGoToOptions) return; /* got it already */ if(m_bGoToOptions) return; /* got it already */
@@ -259,7 +264,6 @@ void ScreenSelectCourse::Input( const DeviceInput& DeviceI, InputEventType type,
return; return;
} }
PlayerNumber pn = GAMESTATE->GetCurrentStyleDef()->ControllerToPlayerNumber( GameI.controller );
if( CodeDetector::EnteredEasierDifficulty(GameI.controller) ) if( CodeDetector::EnteredEasierDifficulty(GameI.controller) )
{ {
if( GAMESTATE->ChangeCourseDifficulty( pn, +1 ) ) if( GAMESTATE->ChangeCourseDifficulty( pn, +1 ) )
stepmania/src/ScreenSelectMusic.cpp
+6 -2
View File
@@ -653,6 +653,12 @@ void ScreenSelectMusic::Input( const DeviceInput& DeviceI, InputEventType type,
if( !GameI.IsValid() ) return; // don't care if( !GameI.IsValid() ) return; // don't care
/* XXX: What's the difference between this and StyleI.player? */
PlayerNumber pn = GAMESTATE->GetCurrentStyleDef()->ControllerToPlayerNumber( GameI.controller );
if( !GAMESTATE->IsHumanPlayer(pn) )
return;
if( m_bMadeChoice && if( m_bMadeChoice &&
MenuI.IsValid() && MenuI.IsValid() &&
MenuI.button == MENU_BUTTON_START && MenuI.button == MENU_BUTTON_START &&
@@ -739,8 +745,6 @@ void ScreenSelectMusic::Input( const DeviceInput& DeviceI, InputEventType type,
} }
PlayerNumber pn = GAMESTATE->GetCurrentStyleDef()->ControllerToPlayerNumber( GameI.controller );
// TRICKY: Do default processing of MenuLeft and MenuRight before detecting // TRICKY: Do default processing of MenuLeft and MenuRight before detecting
// codes. Do default processing of Start AFTER detecting codes. This gives us a // codes. Do default processing of Start AFTER detecting codes. This gives us a