diff --git a/stepmania/src/GameManager.cpp b/stepmania/src/GameManager.cpp index d5644ad9d1..d077b21937 100644 --- a/stepmania/src/GameManager.cpp +++ b/stepmania/src/GameManager.cpp @@ -586,7 +586,36 @@ StyleDef g_StyleDefs[NUM_STYLES] = 0,2,4,1,3,5,7,9,6,8 }, }, - +/* { // PUMP_STYLE_COUPLE + GAME_PUMP, // m_Game + true, // m_bUsedForGameplay + false, // m_bUsedForEdit + "pump-couple", // m_szName + NOTES_TYPE_PUMP_COUPLE, // m_NotesType + StyleDef::TWO_PLAYERS_TWO_CREDITS, // m_StyleType + { 160, 480 }, // m_iCenterX + 5, // m_iColsPerPlayer + { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; + { // PLAYER_1 + { TRACK_1, GAME_CONTROLLER_1, PUMP_BUTTON_DOWNLEFT, -PUMP_COL_SPACING*2 }, + { TRACK_2, GAME_CONTROLLER_1, PUMP_BUTTON_UPLEFT, -PUMP_COL_SPACING*1 }, + { TRACK_3, GAME_CONTROLLER_1, PUMP_BUTTON_CENTER, +PUMP_COL_SPACING*0 }, + { TRACK_4, GAME_CONTROLLER_1, PUMP_BUTTON_UPRIGHT, +PUMP_COL_SPACING*1 }, + { TRACK_5, GAME_CONTROLLER_1, PUMP_BUTTON_DOWNRIGHT, +PUMP_COL_SPACING*2 }, + }, + { // PLAYER_2 + { TRACK_1, GAME_CONTROLLER_2, PUMP_BUTTON_DOWNLEFT, -PUMP_COL_SPACING*2 }, + { TRACK_2, GAME_CONTROLLER_2, PUMP_BUTTON_UPLEFT, -PUMP_COL_SPACING*1 }, + { TRACK_3, GAME_CONTROLLER_2, PUMP_BUTTON_CENTER, +PUMP_COL_SPACING*0 }, + { TRACK_4, GAME_CONTROLLER_2, PUMP_BUTTON_UPRIGHT, +PUMP_COL_SPACING*1 }, + { TRACK_5, GAME_CONTROLLER_2, PUMP_BUTTON_DOWNRIGHT, +PUMP_COL_SPACING*2 }, + }, + }, + { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; + 0,2,4,1,3 + }, + }, +*/ { // EZ2_STYLE_SINGLE GAME_EZ2, // m_Game @@ -823,7 +852,7 @@ GameDef* GameManager::GetGameDefForGame( Game g ) return &g_GameDefs[ g ]; } -StyleDef* GameManager::GetStyleDefForStyle( Style s ) +const StyleDef* GameManager::GetStyleDefForStyle( Style s ) { ASSERT( s != STYLE_NONE ); return &g_StyleDefs[ s ]; diff --git a/stepmania/src/GameManager.h b/stepmania/src/GameManager.h index 35453b2911..7a41dde7ba 100644 --- a/stepmania/src/GameManager.h +++ b/stepmania/src/GameManager.h @@ -22,7 +22,7 @@ public: GameManager(); GameDef* GetGameDefForGame( Game g ); - StyleDef* GetStyleDefForStyle( Style s ); + const StyleDef* GetStyleDefForStyle( Style s ); void GetGameplayStylesForGame( Game game, CArray& aStylesAddTo ); // do not include edit-specific void GetNotesTypesForGame( Game game, CArray& aNotesTypeAddTo ); // only look at edit-specific styles