TWO_PLAYERS_SHARED_SIDES.

stepmania/src/ArrowEffects.cpp

@@ -85,7 +85,8 @@ void ArrowEffects::Update()
 		for( int iColNum = 0; iColNum < MAX_COLS_PER_PLAYER; ++iColNum )
 		{
 			const int iNumCols = pStyle->m_iColsPerPlayer;
-			const int iNumSides = pStyle->m_StyleType==ONE_PLAYER_TWO_SIDES ? 2 : 1;
+			const int iNumSides = (pStyle->m_StyleType==ONE_PLAYER_TWO_SIDES ||
+					       pStyle->m_StyleType==TWO_PLAYERS_SHARED_SIDES) ? 2 : 1;
 			const int iNumColsPerSide = iNumCols / iNumSides;
 			const int iSideIndex = iColNum / iNumColsPerSide;
 			const int iColOnSide = iColNum % iNumColsPerSide;

stepmania/src/Game.cpp

@@ -67,6 +67,7 @@ void Game::MenuInputToGameInput( MenuInput MenuI, GameInput GameIout[4] ) const
 		iNumSidesUsing = 1;
 		break;
 	case ONE_PLAYER_TWO_SIDES:
+	case TWO_PLAYERS_SHARED_SIDES:
 		controller[0] = GAME_CONTROLLER_1;
 		controller[1] = GAME_CONTROLLER_2;
 		iNumSidesUsing = 2;

stepmania/src/GameCommand.cpp

@@ -403,13 +403,12 @@ int GetCreditsRequiredToPlayStyle( const Style *style )
 	{
 	case ONE_PLAYER_ONE_SIDE:
 		return 1;
+	case TWO_PLAYERS_SHARED_SIDES:
 	case TWO_PLAYERS_TWO_SIDES:
 		return 2;
 	case ONE_PLAYER_TWO_SIDES:
 		return (GAMESTATE->GetPremium() == PREMIUM_DOUBLE) ? 1 : 2;
-	default:
+	DEFAULT_FAIL( style->m_StyleType );
-		ASSERT(0);
-		return 1;
 	}
 }
 
@@ -629,6 +628,7 @@ void GameCommand::ApplySelf( const vector<PlayerNumber> &vpns ) const
 			break;
 		case TWO_PLAYERS_TWO_SIDES:
 		case ONE_PLAYER_TWO_SIDES:
+		case TWO_PLAYERS_SHARED_SIDES:
 			{
 				FOREACH_PlayerNumber( p )
 					GAMESTATE->m_bSideIsJoined[p] = true;

stepmania/src/GameState.cpp

@@ -857,7 +857,14 @@ int	GameState::GetNumPlayersEnabled() const
 bool GameState::PlayerUsingBothSides() const
 {
 	ASSERT( this->GetCurrentStyle() != NULL );
-	return this->GetCurrentStyle()->m_StyleType == ONE_PLAYER_TWO_SIDES;
+	switch( GetCurrentStyle()->m_StyleType )
+	{
+	case ONE_PLAYER_TWO_SIDES:
+	case TWO_PLAYERS_SHARED_SIDES:
+		return true;
+	default:
+		return false;
+	}
 }
 
 bool GameState::IsHumanPlayer( PlayerNumber pn ) const
@@ -873,6 +880,7 @@ bool GameState::IsHumanPlayer( PlayerNumber pn ) const
 	switch( GetCurrentStyle()->m_StyleType )
 	{
 	case TWO_PLAYERS_TWO_SIDES:
+	case TWO_PLAYERS_SHARED_SIDES:
 		return true;
 	case ONE_PLAYER_ONE_SIDE:
 	case ONE_PLAYER_TWO_SIDES:

stepmania/src/ScreenEdit.cpp

@@ -1105,6 +1105,7 @@ static void ShiftToRightSide( int &iCol, int iNumTracks )
 		break;
 	case TWO_PLAYERS_TWO_SIDES:
 	case ONE_PLAYER_TWO_SIDES:
+	case TWO_PLAYERS_SHARED_SIDES: // XXX is this right?
 		iCol += iNumTracks/2;
 		break;
 	}