diff --git a/stepmania/src/ArrowEffects.cpp b/stepmania/src/ArrowEffects.cpp index b7d6a419b6..ddf168216c 100644 --- a/stepmania/src/ArrowEffects.cpp +++ b/stepmania/src/ArrowEffects.cpp @@ -85,8 +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 || - pStyle->m_StyleType==TWO_PLAYERS_SHARED_SIDES) ? 2 : 1; + const int iNumSides = (pStyle->m_StyleType==StyleType_OnePlayerTwoSides || + pStyle->m_StyleType==StyleType_TwoPlayersSharedSides) ? 2 : 1; const int iNumColsPerSide = iNumCols / iNumSides; const int iSideIndex = iColNum / iNumColsPerSide; const int iColOnSide = iColNum % iNumColsPerSide; diff --git a/stepmania/src/GameCommand.cpp b/stepmania/src/GameCommand.cpp index 8700d6c364..4f2f325ba6 100644 --- a/stepmania/src/GameCommand.cpp +++ b/stepmania/src/GameCommand.cpp @@ -411,12 +411,12 @@ int GetCreditsRequiredToPlayStyle( const Style *style ) switch( style->m_StyleType ) { - case ONE_PLAYER_ONE_SIDE: + case StyleType_OnePlayerOneSide: return 1; - case TWO_PLAYERS_SHARED_SIDES: - case TWO_PLAYERS_TWO_SIDES: + case StyleType_TwoPlayersSharedSides: + case StyleType_TwoPlayersTwoSides: return 2; - case ONE_PLAYER_TWO_SIDES: + case StyleType_OnePlayerTwoSides: return (GAMESTATE->GetPremium() == PREMIUM_DOUBLE) ? 1 : 2; DEFAULT_FAIL( style->m_StyleType ); } @@ -439,7 +439,7 @@ static bool AreStyleAndPlayModeCompatible( const Style *style, PlayMode pm ) return false; /* Don't allow battle modes if the style takes both sides. */ - if( style->m_StyleType==ONE_PLAYER_TWO_SIDES ) + if( style->m_StyleType==StyleType_OnePlayerTwoSides ) return false; } @@ -500,7 +500,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 == ONE_PLAYER_ONE_SIDE && + if( m_pStyle->m_StyleType == StyleType_OnePlayerOneSide && GAMESTATE->GetNumSidesJoined() > 1 ) { if( why ) @@ -642,11 +642,11 @@ void GameCommand::ApplySelf( const vector &vpns ) const // that requires both sides, join the other side. switch( m_pStyle->m_StyleType ) { - case ONE_PLAYER_ONE_SIDE: + case StyleType_OnePlayerOneSide: break; - case TWO_PLAYERS_TWO_SIDES: - case ONE_PLAYER_TWO_SIDES: - case TWO_PLAYERS_SHARED_SIDES: + case StyleType_TwoPlayersTwoSides: + case StyleType_OnePlayerTwoSides: + case StyleType_TwoPlayersSharedSides: { FOREACH_PlayerNumber( p ) GAMESTATE->JoinPlayer( p ); diff --git a/stepmania/src/GameConstantsAndTypes.h b/stepmania/src/GameConstantsAndTypes.h index 5a6636be0b..6f23691a64 100644 --- a/stepmania/src/GameConstantsAndTypes.h +++ b/stepmania/src/GameConstantsAndTypes.h @@ -396,10 +396,10 @@ struct DisplayBpms enum StyleType { - ONE_PLAYER_ONE_SIDE, // e.g. single - TWO_PLAYERS_TWO_SIDES, // e.g. versus - ONE_PLAYER_TWO_SIDES, // e.g. double - TWO_PLAYERS_SHARED_SIDES, // e.g. routine + StyleType_OnePlayerOneSide, // e.g. single + StyleType_TwoPlayersTwoSides, // e.g. versus + StyleType_OnePlayerTwoSides, // e.g. double + StyleType_TwoPlayersSharedSides, // e.g. routine NUM_StyleType, StyleType_Invalid }; diff --git a/stepmania/src/GameManager.cpp b/stepmania/src/GameManager.cpp index 3be2f51ebc..53f1ff5d5d 100644 --- a/stepmania/src/GameManager.cpp +++ b/stepmania/src/GameManager.cpp @@ -626,7 +626,7 @@ static Style g_Styles[] = true, // m_bUsedForHowToPlay "single", // m_szName STEPS_TYPE_DANCE_SINGLE, // m_StepsType - ONE_PLAYER_ONE_SIDE, // m_StyleType + StyleType_OnePlayerOneSide, // m_StyleType 4, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 @@ -661,7 +661,7 @@ static Style g_Styles[] = false, // m_bUsedForHowToPlay "versus", // m_szName STEPS_TYPE_DANCE_SINGLE, // m_StepsType - TWO_PLAYERS_TWO_SIDES, // m_StyleType + StyleType_TwoPlayersTwoSides, // m_StyleType 4, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 @@ -696,7 +696,7 @@ static Style g_Styles[] = false, // m_bUsedForHowToPlay "double", // m_szName STEPS_TYPE_DANCE_DOUBLE, // m_StepsType - ONE_PLAYER_TWO_SIDES, // m_StyleType + StyleType_OnePlayerTwoSides, // m_StyleType 8, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 @@ -739,7 +739,7 @@ static Style g_Styles[] = false, // m_bUsedForHowToPlay "couple", // m_szName STEPS_TYPE_DANCE_COUPLE, // m_StepsType - TWO_PLAYERS_TWO_SIDES, // m_StyleType + StyleType_TwoPlayersTwoSides, // m_StyleType 4, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 @@ -774,7 +774,7 @@ static Style g_Styles[] = false, // m_bUsedForHowToPlay "solo", // m_szName STEPS_TYPE_DANCE_SOLO, // m_StepsType - ONE_PLAYER_ONE_SIDE, // m_StyleType + StyleType_OnePlayerOneSide, // m_StyleType 6, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 @@ -813,7 +813,7 @@ static Style g_Styles[] = false, // m_bUsedForHowToPlay "couple-edit", // m_szName STEPS_TYPE_DANCE_COUPLE, // m_StepsType - ONE_PLAYER_ONE_SIDE, // m_StyleType + StyleType_OnePlayerOneSide, // m_StyleType 8, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 @@ -890,7 +890,7 @@ static Style g_Styles[] = false, // m_bUsedForHowToPlay "routine", // m_szName STEPS_TYPE_DANCE_ROUTINE, // m_StepsType - TWO_PLAYERS_SHARED_SIDES, // m_StyleType + StyleType_TwoPlayersSharedSides, // m_StyleType 8, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 @@ -934,7 +934,7 @@ static Style g_Styles[] = true, // m_bUsedForHowToPlay "single", // m_szName STEPS_TYPE_PUMP_SINGLE, // m_StepsType - ONE_PLAYER_ONE_SIDE, // m_StyleType + StyleType_OnePlayerOneSide, // m_StyleType 5, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 @@ -971,7 +971,7 @@ static Style g_Styles[] = false, // m_bUsedForHowToPlay "versus", // m_szName STEPS_TYPE_PUMP_SINGLE, // m_StepsType - TWO_PLAYERS_TWO_SIDES, // m_StyleType + StyleType_TwoPlayersTwoSides, // m_StyleType 5, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 @@ -1008,7 +1008,7 @@ static Style g_Styles[] = false, // m_bUsedForHowToPlay "halfdouble", // m_szName STEPS_TYPE_PUMP_HALFDOUBLE, // m_StepsType - ONE_PLAYER_TWO_SIDES, // m_StyleType + StyleType_OnePlayerTwoSides, // m_StyleType 6, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 @@ -1047,7 +1047,7 @@ static Style g_Styles[] = false, // m_bUsedForHowToPlay "double", // m_szName STEPS_TYPE_PUMP_DOUBLE, // m_StepsType - ONE_PLAYER_TWO_SIDES, // m_StyleType + StyleType_OnePlayerTwoSides, // m_StyleType 10, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 @@ -1094,7 +1094,7 @@ static Style g_Styles[] = false, // m_bUsedForHowToPlay "couple", // m_szName STEPS_TYPE_PUMP_COUPLE, // m_StepsType - TWO_PLAYERS_TWO_SIDES, // m_StyleType + StyleType_TwoPlayersTwoSides, // m_StyleType 5, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 @@ -1131,7 +1131,7 @@ static Style g_Styles[] = false, // m_bUsedForHowToPlay "couple-edit", // m_szName STEPS_TYPE_PUMP_COUPLE, // m_StepsType - ONE_PLAYER_ONE_SIDE, // m_StyleType + StyleType_OnePlayerOneSide, // m_StyleType 10, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 @@ -1173,7 +1173,7 @@ static Style g_Styles[] = true, // m_bUsedForHowToPlay "single", // m_szName STEPS_TYPE_EZ2_SINGLE, // m_StepsType - ONE_PLAYER_ONE_SIDE, // m_StyleType + StyleType_OnePlayerOneSide, // m_StyleType 5, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 @@ -1210,7 +1210,7 @@ static Style g_Styles[] = false, // m_bUsedForHowToPlay "real", // m_szName STEPS_TYPE_EZ2_REAL, // m_StepsType - ONE_PLAYER_ONE_SIDE, // m_StyleType + StyleType_OnePlayerOneSide, // m_StyleType 7, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 @@ -1251,7 +1251,7 @@ static Style g_Styles[] = false, // m_bUsedForHowToPlay "versus", // m_szName STEPS_TYPE_EZ2_SINGLE, // m_StepsType - TWO_PLAYERS_TWO_SIDES, // m_StyleType + StyleType_TwoPlayersTwoSides, // m_StyleType 5, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 @@ -1288,7 +1288,7 @@ static Style g_Styles[] = false, // m_bUsedForHowToPlay "versusReal", // m_szName STEPS_TYPE_EZ2_REAL, // m_StepsType - TWO_PLAYERS_TWO_SIDES, // m_StyleType + StyleType_TwoPlayersTwoSides, // m_StyleType 7, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 @@ -1329,7 +1329,7 @@ static Style g_Styles[] = false, // m_bUsedForHowToPlay "double", // m_szName STEPS_TYPE_EZ2_DOUBLE, // m_StepsType - ONE_PLAYER_ONE_SIDE, // m_StyleType + StyleType_OnePlayerOneSide, // m_StyleType 10, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 @@ -1376,7 +1376,7 @@ static Style g_Styles[] = true, // m_bUsedForHowToPlay "single", // m_szName STEPS_TYPE_PARA_SINGLE, // m_StepsType - ONE_PLAYER_ONE_SIDE, // m_StyleType + StyleType_OnePlayerOneSide, // m_StyleType 5, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 @@ -1413,7 +1413,7 @@ static Style g_Styles[] = true, // m_bUsedForHowToPlay "versus", // m_szName STEPS_TYPE_PARA_VERSUS, // m_StepsType - TWO_PLAYERS_TWO_SIDES, // m_StyleType + StyleType_TwoPlayersTwoSides, // m_StyleType 5, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 @@ -1450,7 +1450,7 @@ static Style g_Styles[] = true, // m_bUsedForHowToPlay "single", // m_szName STEPS_TYPE_DS3DDX_SINGLE, // m_StepsType - ONE_PLAYER_ONE_SIDE, // m_StyleType + StyleType_OnePlayerOneSide, // m_StyleType 8, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 @@ -1493,7 +1493,7 @@ static Style g_Styles[] = true, // m_bUsedForHowToPlay "single5", // m_szName STEPS_TYPE_BEAT_SINGLE5, // m_StepsType - ONE_PLAYER_ONE_SIDE, // m_StyleType + StyleType_OnePlayerOneSide, // m_StyleType 6, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 @@ -1532,7 +1532,7 @@ static Style g_Styles[] = false, // m_bUsedForHowToPlay "double5", // m_szName STEPS_TYPE_BEAT_DOUBLE5, // m_StepsType - ONE_PLAYER_TWO_SIDES, // m_StyleType + StyleType_OnePlayerTwoSides, // m_StyleType 12, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 @@ -1583,7 +1583,7 @@ static Style g_Styles[] = false, // m_bUsedForHowToPlay "single7", // m_szName STEPS_TYPE_BEAT_SINGLE7, // m_StepsType - ONE_PLAYER_ONE_SIDE, // m_StyleType + StyleType_OnePlayerOneSide, // m_StyleType 8, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 @@ -1626,7 +1626,7 @@ static Style g_Styles[] = false, // m_bUsedForHowToPlay "double7", // m_szName STEPS_TYPE_BEAT_DOUBLE7, // m_StepsType - ONE_PLAYER_TWO_SIDES, // m_StyleType + StyleType_OnePlayerTwoSides, // m_StyleType 16, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 @@ -1685,7 +1685,7 @@ static Style g_Styles[] = true, // m_bUsedForHowToPlay "single", // m_szName STEPS_TYPE_MANIAX_SINGLE, // m_StepsType - ONE_PLAYER_ONE_SIDE, // m_StyleType + StyleType_OnePlayerOneSide, // m_StyleType 4, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 @@ -1720,7 +1720,7 @@ static Style g_Styles[] = false, // m_bUsedForHowToPlay "versus", // m_szName STEPS_TYPE_MANIAX_SINGLE, // m_StepsType - TWO_PLAYERS_TWO_SIDES, // m_StyleType + StyleType_TwoPlayersTwoSides, // m_StyleType 4, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 @@ -1755,7 +1755,7 @@ static Style g_Styles[] = false, // m_bUsedForHowToPlay "double", // m_szName STEPS_TYPE_MANIAX_DOUBLE, // m_StepsType - ONE_PLAYER_TWO_SIDES, // m_StyleType + StyleType_OnePlayerTwoSides, // m_StyleType 8, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 @@ -1798,7 +1798,7 @@ static Style g_Styles[] = false, // m_bUsedForHowToPlay "single4", // m_szName STEPS_TYPE_TECHNO_SINGLE4, // m_StepsType - ONE_PLAYER_ONE_SIDE, // m_StyleType + StyleType_OnePlayerOneSide, // m_StyleType 4, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 @@ -1833,7 +1833,7 @@ static Style g_Styles[] = false, // m_bUsedForHowToPlay "single5", // m_szName STEPS_TYPE_TECHNO_SINGLE5, // m_StepsType - ONE_PLAYER_ONE_SIDE, // m_StyleType + StyleType_OnePlayerOneSide, // m_StyleType 5, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 @@ -1872,7 +1872,7 @@ static Style g_Styles[] = true, // m_bUsedForHowToPlay "single8", // m_szName STEPS_TYPE_TECHNO_SINGLE8, // m_StepsType - ONE_PLAYER_ONE_SIDE, // m_StyleType + StyleType_OnePlayerOneSide, // m_StyleType 8, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 @@ -1915,7 +1915,7 @@ static Style g_Styles[] = false, // m_bUsedForHowToPlay "versus4", // m_szName STEPS_TYPE_TECHNO_SINGLE4, // m_StepsType - TWO_PLAYERS_TWO_SIDES, // m_StyleType + StyleType_TwoPlayersTwoSides, // m_StyleType 4, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 @@ -1950,7 +1950,7 @@ static Style g_Styles[] = false, // m_bUsedForHowToPlay "versus5", // m_szName STEPS_TYPE_TECHNO_SINGLE5, // m_StepsType - TWO_PLAYERS_TWO_SIDES, // m_StyleType + StyleType_TwoPlayersTwoSides, // m_StyleType 5, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 @@ -1989,7 +1989,7 @@ static Style g_Styles[] = false, // m_bUsedForHowToPlay "versus8", // m_szName STEPS_TYPE_TECHNO_SINGLE8, // m_StepsType - TWO_PLAYERS_TWO_SIDES, // m_StyleType + StyleType_TwoPlayersTwoSides, // m_StyleType 8, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 @@ -2034,7 +2034,7 @@ static Style g_Styles[] = false, // m_bUsedForHowToPlay "double4", // m_szName STEPS_TYPE_TECHNO_DOUBLE4, // m_StepsType - ONE_PLAYER_TWO_SIDES, // m_StyleType + StyleType_OnePlayerTwoSides, // m_StyleType 8, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 @@ -2077,7 +2077,7 @@ static Style g_Styles[] = false, // m_bUsedForHowToPlay "double5", // m_szName STEPS_TYPE_TECHNO_DOUBLE5, // m_StepsType - ONE_PLAYER_TWO_SIDES, // m_StyleType + StyleType_OnePlayerTwoSides, // m_StyleType 10, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 @@ -2126,7 +2126,7 @@ static Style g_Styles[] = false, // m_bUsedForHowToPlay "popn-five", // m_szName STEPS_TYPE_POPN_FIVE, // m_StepsType - ONE_PLAYER_ONE_SIDE, // m_StyleType + StyleType_OnePlayerOneSide, // m_StyleType 5, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 @@ -2163,7 +2163,7 @@ static Style g_Styles[] = true, // m_bUsedForHowToPlay "popn-nine", // m_szName STEPS_TYPE_POPN_NINE, // m_StepsType - ONE_PLAYER_ONE_SIDE, // m_StyleType + StyleType_OnePlayerOneSide, // m_StyleType 9, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 @@ -2208,7 +2208,7 @@ static Style g_Styles[] = false, // m_bUsedForHowToPlay "cabinet", // m_szName STEPS_TYPE_LIGHTS_CABINET, // m_StepsType - ONE_PLAYER_ONE_SIDE, // m_StyleType + StyleType_OnePlayerOneSide, // m_StyleType NUM_CabinetLight, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp index 3bb22c6070..8401fd3b36 100644 --- a/stepmania/src/GameState.cpp +++ b/stepmania/src/GameState.cpp @@ -901,7 +901,7 @@ void GameState::SetCurrentStyle( const Style *pStyle ) m_pCurStyle.Set( pStyle ); if( INPUTMAPPER ) { - if( GetCurrentStyle() && GetCurrentStyle()->m_StyleType == ONE_PLAYER_TWO_SIDES ) + if( GetCurrentStyle() && GetCurrentStyle()->m_StyleType == StyleType_OnePlayerTwoSides ) INPUTMAPPER->SetJoinControllers( m_MasterPlayerNumber ); else INPUTMAPPER->SetJoinControllers( PLAYER_INVALID ); @@ -958,11 +958,11 @@ bool GameState::IsHumanPlayer( PlayerNumber pn ) const switch( GetCurrentStyle()->m_StyleType ) { - case TWO_PLAYERS_TWO_SIDES: - case TWO_PLAYERS_SHARED_SIDES: + case StyleType_TwoPlayersTwoSides: + case StyleType_TwoPlayersSharedSides: return true; - case ONE_PLAYER_ONE_SIDE: - case ONE_PLAYER_TWO_SIDES: + case StyleType_OnePlayerOneSide: + case StyleType_OnePlayerTwoSides: return pn == m_MasterPlayerNumber; default: ASSERT(0); // invalid style type diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp index 3a7957b2ca..b081c09d9c 100644 --- a/stepmania/src/Player.cpp +++ b/stepmania/src/Player.cpp @@ -238,7 +238,7 @@ void Player::Init( // LuaReference expr = THEME->GetMetricR( sType,"JudgmentTransformCommandFunction" ); - bool bPlayerUsingBothSides = GAMESTATE->GetCurrentStyle()->m_StyleType==ONE_PLAYER_TWO_SIDES; + bool bPlayerUsingBothSides = GAMESTATE->GetCurrentStyle()->m_StyleType==StyleType_OnePlayerTwoSides; Actor temp; int iEnabledPlayerIndex = -1; @@ -502,7 +502,7 @@ void Player::Load() } const bool bReverse = m_pPlayerState->m_PlayerOptions.GetStage().GetReversePercentForColumn( 0 ) == 1; - bool bPlayerUsingBothSides = GAMESTATE->GetCurrentStyle()->m_StyleType==ONE_PLAYER_TWO_SIDES; + bool bPlayerUsingBothSides = GAMESTATE->GetCurrentStyle()->m_StyleType==StyleType_OnePlayerTwoSides; if( m_pCombo ) { m_pCombo->SetX( COMBO_X.GetValue(pn, bPlayerUsingBothSides) ); @@ -1025,7 +1025,7 @@ void Player::DrawPrimitives() PlayerNumber pn = m_pPlayerState->m_PlayerNumber; // May have both players in doubles (for battle play); only draw primary player. - if( GAMESTATE->GetCurrentStyle()->m_StyleType == ONE_PLAYER_TWO_SIDES && + if( GAMESTATE->GetCurrentStyle()->m_StyleType == StyleType_OnePlayerTwoSides && pn != GAMESTATE->m_MasterPlayerNumber ) return; diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp index 7b1764eee1..945ff88e41 100644 --- a/stepmania/src/ScreenEdit.cpp +++ b/stepmania/src/ScreenEdit.cpp @@ -1099,11 +1099,11 @@ static void ShiftToRightSide( int &iCol, int iNumTracks ) switch( GAMESTATE->GetCurrentStyle()->m_StyleType ) { DEFAULT_FAIL( GAMESTATE->GetCurrentStyle()->m_StyleType ); - case ONE_PLAYER_ONE_SIDE: + case StyleType_OnePlayerOneSide: break; - case TWO_PLAYERS_TWO_SIDES: - case ONE_PLAYER_TWO_SIDES: - case TWO_PLAYERS_SHARED_SIDES: + case StyleType_TwoPlayersTwoSides: + case StyleType_OnePlayerTwoSides: + case StyleType_TwoPlayersSharedSides: iCol += iNumTracks/2; break; } @@ -2058,7 +2058,7 @@ void ScreenEdit::InputPlay( const InputEventPlus &input, EditButton EditB ) m_Player->Step( iCol, -1, input.DeviceI.ts, false, input.type == IET_RELEASE ); break; case PLAYER_2: - if( GAMESTATE->GetCurrentStyle()->m_StyleType == TWO_PLAYERS_SHARED_SIDES ) + if( GAMESTATE->GetCurrentStyle()->m_StyleType == StyleType_TwoPlayersSharedSides ) m_Player->Step( iCol, -1, input.DeviceI.ts, false, input.type == IET_RELEASE ); } } diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 7768d79c7c..54b3f77bcd 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -564,7 +564,7 @@ void ScreenGameplay::Init() #if !defined(WITHOUT_NETWORKING) // Only used in SMLAN/SMOnline: - if( NSMAN->useSMserver && GAMESTATE->GetCurrentStyle()->m_StyleType != ONE_PLAYER_TWO_SIDES ) + if( NSMAN->useSMserver && GAMESTATE->GetCurrentStyle()->m_StyleType != StyleType_OnePlayerTwoSides ) { m_bShowScoreboard = PREFSMAN->m_bEnableScoreboard.Get(); PlayerNumber pn = GAMESTATE->GetFirstDisabledPlayer(); @@ -795,7 +795,7 @@ bool ScreenGameplay::Center1Player() const (bool)ALLOW_CENTER_1_PLAYER && GAMESTATE->m_PlayMode != PLAY_MODE_BATTLE && GAMESTATE->m_PlayMode != PLAY_MODE_RAVE && - GAMESTATE->GetCurrentStyle()->m_StyleType == ONE_PLAYER_ONE_SIDE; + GAMESTATE->GetCurrentStyle()->m_StyleType == StyleType_OnePlayerOneSide; } // diff --git a/stepmania/src/Style.cpp b/stepmania/src/Style.cpp index 9995f73cb6..069a310656 100644 --- a/stepmania/src/Style.cpp +++ b/stepmania/src/Style.cpp @@ -39,7 +39,7 @@ GameInput Style::StyleInputToGameInput( int iCol, PlayerNumber pn ) const { ASSERT_M( pn < NUM_PLAYERS && iCol < MAX_COLS_PER_PLAYER, ssprintf("P%i C%i", pn, iCol) ); - bool bUsingOneSide = m_StyleType != ONE_PLAYER_TWO_SIDES && m_StyleType != TWO_PLAYERS_SHARED_SIDES; + bool bUsingOneSide = m_StyleType != StyleType_OnePlayerTwoSides && m_StyleType != StyleType_TwoPlayersSharedSides; FOREACH_GameController(gc) {