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

Fix Player2's highlight showing in ScreenPlayerOptions when not joined.

Browse Source
This commit is contained in:
Chris Danford
2003-03-16 22:51:29 +00:00
parent 93483d0140
commit ccb722c182
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameState.cpp
+3 -2
View File
@@ -215,8 +215,9 @@ bool GameState::IsPlayable( const ModeChoice& mc )
bool GameState::IsPlayerEnabled( PlayerNumber pn ) bool GameState::IsPlayerEnabled( PlayerNumber pn )
{ {
if( GAMESTATE->m_bIsOnSystemMenu ) // if no style set (we're in TitleMenu, ConfigInstruments or something) // no longer necessary
return true; // allow input from both sides // if( GAMESTATE->m_bIsOnSystemMenu ) // if no style set (we're in TitleMenu, ConfigInstruments or something)
// return true; // allow input from both sides
if( m_CurStyle == STYLE_INVALID ) // no style chosen if( m_CurStyle == STYLE_INVALID ) // no style chosen
if( this->m_bPlayersCanJoin ) if( this->m_bPlayersCanJoin )
stepmania/src/ScreenManager.cpp
+10 -6
View File
@@ -434,12 +434,16 @@ void ScreenManager::SetNewScreen( CString sClassName )
/* If this is a system menu, don't let the operator key touch it! /* If this is a system menu, don't let the operator key touch it!
However, if you add an options screen, please include it here -- Miryokuteki */ However, if you add an options screen, please include it here -- Miryokuteki */
if( sClassName == "ScreenOptionsMenu" || sClassName == "ScreenMachineOptions" || if( sClassName == "ScreenOptionsMenu" ||
sClassName == "ScreenOptions" || sClassName == "ScreenInputOptions" || sClassName == "ScreenMachineOptions" ||
sClassName == "ScreenGraphicOptions" || sClassName == "ScreenGameplayOptions" || sClassName == "ScreenInputOptions" ||
sClassName == "ScreenMapControllers" || sClassName == "ScreenPlayerOptions" || sClassName == "ScreenGraphicOptions" ||
sClassName == "ScreenAppearanceOptions" || sClassName == "ScreenEdit" || sClassName == "ScreenGameplayOptions" ||
sClassName == "ScreenEditMenu" || sClassName == "ScreenSoundOptions") sClassName == "ScreenMapControllers" ||
sClassName == "ScreenAppearanceOptions" ||
sClassName == "ScreenEdit" ||
sClassName == "ScreenEditMenu" ||
sClassName == "ScreenSoundOptions" )
GAMESTATE->m_bIsOnSystemMenu = true; GAMESTATE->m_bIsOnSystemMenu = true;
else else
GAMESTATE->m_bIsOnSystemMenu = false; GAMESTATE->m_bIsOnSystemMenu = false;