From cc58f4356767034a8ca446a422cfab256ad0ff55 Mon Sep 17 00:00:00 2001 From: Kyzentun Date: Thu, 13 Mar 2014 20:14:21 -0600 Subject: [PATCH] Switching to double style shouldn't join the other player. It isn't necessary for input, the engine ScreenSelectMusic doesn't do it, and it forces a theme with custom SSM and style changing to unjoin the player that wasn't really joined. --- src/GameCommand.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/GameCommand.cpp b/src/GameCommand.cpp index d2fc35a7bc..e3b60582d2 100644 --- a/src/GameCommand.cpp +++ b/src/GameCommand.cpp @@ -529,7 +529,7 @@ bool GameCommand::IsPlayable( RString *why ) const /* If both sides are joined, disallow singles modes, since easy to select * them accidentally, instead of versus mode. */ if( m_pStyle->m_StyleType == StyleType_OnePlayerOneSide && - GAMESTATE->GetNumSidesJoined() > 1 ) + GAMESTATE->GetNumPlayersEnabled() > 1 ) { if( why ) *why = "too many players joined for ONE_PLAYER_ONE_CREDIT"; @@ -669,9 +669,9 @@ void GameCommand::ApplySelf( const vector &vpns ) const switch( m_pStyle->m_StyleType ) { case StyleType_OnePlayerOneSide: + case StyleType_OnePlayerTwoSides: break; case StyleType_TwoPlayersTwoSides: - case StyleType_OnePlayerTwoSides: case StyleType_TwoPlayersSharedSides: { FOREACH_PlayerNumber( p )