Modularize coin logic

2003-03-09 03:28:34 +00:00
parent 769dac616f
commit 51ca82a8e6
9 changed files with 136 additions and 162 deletions
@@ -261,9 +261,12 @@ bool GameState::IsPlayable( const ModeChoice& mc )

 bool GameState::IsPlayerEnabled( PlayerNumber pn )
 {
-	if( m_CurStyle == STYLE_INVALID )	// if no style set (we're in TitleMenu, ConfigInstruments or something)
+	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 )
+		return m_bSideIsJoined[pn];
+
 	switch( GetCurrentStyleDef()->m_StyleType )
 	{
 	case StyleDef::TWO_PLAYERS_TWO_CREDITS: