From 0b264d276d1dfb38819fb8f7262e0045f4c9c6f5 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 12 Sep 2002 07:50:20 +0000 Subject: [PATCH] Remove separation of Pump couples. (Rest coming; this one first since it wasn't working.) The couples separation stuff just isn't worth the code. --- stepmania/src/GameConstantsAndTypes.h | 3 +- stepmania/src/GameManager.cpp | 68 +++++++++------------------ stepmania/src/NoteData.cpp | 3 +- stepmania/src/NotesLoaderKSF.cpp | 12 ++--- stepmania/src/Style.h | 5 +- 5 files changed, 28 insertions(+), 63 deletions(-) diff --git a/stepmania/src/GameConstantsAndTypes.h b/stepmania/src/GameConstantsAndTypes.h index 05a4d56f53..1170c538ea 100644 --- a/stepmania/src/GameConstantsAndTypes.h +++ b/stepmania/src/GameConstantsAndTypes.h @@ -68,8 +68,7 @@ enum NotesType NOTES_TYPE_DANCE_SOLO, NOTES_TYPE_PUMP_SINGLE, NOTES_TYPE_PUMP_DOUBLE, - NOTES_TYPE_PUMP_COUPLE_1, - NOTES_TYPE_PUMP_COUPLE_2, + NOTES_TYPE_PUMP_COUPLE, NOTES_TYPE_EZ2_SINGLE, NOTES_TYPE_EZ2_SINGLE_HARD, NOTES_TYPE_EZ2_DOUBLE, diff --git a/stepmania/src/GameManager.cpp b/stepmania/src/GameManager.cpp index 6e3f0014df..53c3045037 100644 --- a/stepmania/src/GameManager.cpp +++ b/stepmania/src/GameManager.cpp @@ -41,8 +41,7 @@ struct { { "dance-solo", 6 }, { "pump-single", 5 }, { "pump-double", 10 }, - { "pump-couple-1", 5 }, - { "pump-couple-2", 5 }, + { "pump-couple", 10 }, { "ez2-single", 5 }, // Single: TL,LHH,D,RHH,TR { "ez2-single-hard", 5 }, // Single: TL,LHH,D,RHH,TR { "ez2-double", 10 }, // Double: Single x2 @@ -706,7 +705,7 @@ StyleDef g_StyleDefs[NUM_STYLES] = true, // m_bUsedForGameplay false, // m_bUsedForEdit "Pump Couples", // m_szName - { NOTES_TYPE_PUMP_COUPLE_1,NOTES_TYPE_PUMP_COUPLE_2}, // m_NotesTypes + { NOTES_TYPE_PUMP_COUPLE,NOTES_TYPE_PUMP_COUPLE}, // m_NotesTypes StyleDef::TWO_PLAYERS_TWO_CREDITS, // m_StyleType { 160, 480 }, // m_iCenterX 5, // m_iColsPerPlayer @@ -719,33 +718,38 @@ StyleDef g_StyleDefs[NUM_STYLES] = { 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 }, + { TRACK_6, GAME_CONTROLLER_2, PUMP_BUTTON_DOWNLEFT, -PUMP_COL_SPACING*2 }, + { TRACK_7, GAME_CONTROLLER_2, PUMP_BUTTON_UPLEFT, -PUMP_COL_SPACING*1 }, + { TRACK_8, GAME_CONTROLLER_2, PUMP_BUTTON_CENTER, +PUMP_COL_SPACING*0 }, + { TRACK_9, GAME_CONTROLLER_2, PUMP_BUTTON_UPRIGHT, +PUMP_COL_SPACING*1 }, + { TRACK_10, GAME_CONTROLLER_2, PUMP_BUTTON_DOWNRIGHT, +PUMP_COL_SPACING*2 }, }, }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; 0,2,4,1,3 }, }, - { // STYLE_PUMP_EDIT_COUPLE_1 + { // STYLE_PUMP_EDIT_COUPLE GAME_PUMP, // m_Game false, // m_bUsedForGameplay true, // m_bUsedForEdit - "Pump Couples Player 1", // m_szName - { NOTES_TYPE_PUMP_COUPLE_1,NOTES_TYPE_PUMP_COUPLE_1}, // m_NotesTypes + "Pump Couples", // m_szName + { NOTES_TYPE_PUMP_COUPLE,NOTES_TYPE_PUMP_COUPLE}, // m_NotesTypes StyleDef::ONE_PLAYER_ONE_CREDIT, // m_StyleType { 160, 480 }, // m_iCenterX - 5, // m_iColsPerPlayer + 10, // 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 }, + { TRACK_1, GAME_CONTROLLER_1, PUMP_BUTTON_DOWNLEFT, -PUMP_COL_SPACING*5.0 }, + { TRACK_2, GAME_CONTROLLER_1, PUMP_BUTTON_UPLEFT, -PUMP_COL_SPACING*4.0 }, + { TRACK_3, GAME_CONTROLLER_1, PUMP_BUTTON_CENTER, -PUMP_COL_SPACING*3.0 }, + { TRACK_4, GAME_CONTROLLER_1, PUMP_BUTTON_UPRIGHT, -PUMP_COL_SPACING*2.0 }, + { TRACK_5, GAME_CONTROLLER_1, PUMP_BUTTON_DOWNRIGHT, -PUMP_COL_SPACING*1.0 }, + { TRACK_6, GAME_CONTROLLER_2, PUMP_BUTTON_DOWNLEFT, +PUMP_COL_SPACING*1.0 }, + { TRACK_7, GAME_CONTROLLER_2, PUMP_BUTTON_UPLEFT, +PUMP_COL_SPACING*2.0 }, + { TRACK_8, GAME_CONTROLLER_2, PUMP_BUTTON_CENTER, +PUMP_COL_SPACING*3.0 }, + { TRACK_9, GAME_CONTROLLER_2, PUMP_BUTTON_UPRIGHT, +PUMP_COL_SPACING*4.0 }, + { TRACK_10, GAME_CONTROLLER_2, PUMP_BUTTON_DOWNRIGHT, +PUMP_COL_SPACING*5.0 }, }, { // PLAYER_2 { TRACK_1, GAME_CONTROLLER_2, PUMP_BUTTON_DOWNLEFT, -PUMP_COL_SPACING*2 }, @@ -759,36 +763,6 @@ StyleDef g_StyleDefs[NUM_STYLES] = 0,2,4,1,3 }, }, - { // STYLE_PUMP_EDIT_COUPLE_2 - GAME_PUMP, // m_Game - false, // m_bUsedForGameplay - true, // m_bUsedForEdit - "Pump Couples Player 2", // m_szName - { NOTES_TYPE_PUMP_COUPLE_2,NOTES_TYPE_PUMP_COUPLE_2}, // m_NotesTypes - StyleDef::ONE_PLAYER_ONE_CREDIT, // 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 true, // m_bUsedForGameplay diff --git a/stepmania/src/NoteData.cpp b/stepmania/src/NoteData.cpp index 8f43b6519b..0a133aba77 100644 --- a/stepmania/src/NoteData.cpp +++ b/stepmania/src/NoteData.cpp @@ -503,8 +503,7 @@ void NoteData::Turn( PlayerOptions::TurnType tt ) break; case NOTES_TYPE_PUMP_SINGLE: case NOTES_TYPE_PUMP_DOUBLE: - case NOTES_TYPE_PUMP_COUPLE_1: - case NOTES_TYPE_PUMP_COUPLE_2: + case NOTES_TYPE_PUMP_COUPLE: iTakeFromTrack[0] = 1; iTakeFromTrack[1] = 3; iTakeFromTrack[2] = 2; diff --git a/stepmania/src/NotesLoaderKSF.cpp b/stepmania/src/NotesLoaderKSF.cpp index 3592179089..faf34c872f 100644 --- a/stepmania/src/NotesLoaderKSF.cpp +++ b/stepmania/src/NotesLoaderKSF.cpp @@ -128,14 +128,8 @@ bool KSFLoader::LoadFromKSFFile( const CString &sPath, Notes &out ) notedata.m_iNumTracks = 10; out.m_NotesType = NOTES_TYPE_PUMP_DOUBLE; } else if( sFName.Find("_2") != -1 ) { - /* We never import a COUPLE_1; the _1 side gets imported - * as the SINGLE mode and it gets used as a fallback. This - * way, people can still create separate couples steps for - * the 1p side in Pump (just like you can with any other - * game); we're not stuck with the limitations of KSFs. - * -glenn - */ - out.m_NotesType = NOTES_TYPE_PUMP_COUPLE_2; + notedata.m_iNumTracks = 10; + out.m_NotesType = NOTES_TYPE_PUMP_COUPLE; } out.m_sSMNoteData = notedata.GetSMNoteDataString(); @@ -240,7 +234,7 @@ bool KSFLoader::LoadFromDir( CString sDir, Song &out ) else if( 0==stricmp(sValueName,"TICKCOUNT") || 0==stricmp(sValueName,"STEP") || 0==stricmp(sValueName,"DIFFICULTY")) - ; /* Handled in Notes::LoadFromKSFFile; don't warn. */ + ; /* Handled in LoadFromKSFFile; don't warn. */ else LOG->Trace( "Unexpected value named '%s'", sValueName ); } diff --git a/stepmania/src/Style.h b/stepmania/src/Style.h index 816156b553..87d7a98cc7 100644 --- a/stepmania/src/Style.h +++ b/stepmania/src/Style.h @@ -23,8 +23,7 @@ enum Style STYLE_PUMP_VERSUS, STYLE_PUMP_DOUBLE, STYLE_PUMP_COUPLE, - STYLE_PUMP_EDIT_COUPLE_1, - STYLE_PUMP_EDIT_COUPLE_2, + STYLE_PUMP_EDIT_COUPLE, STYLE_EZ2_SINGLE, STYLE_EZ2_SINGLE_HARD, STYLE_EZ2_DOUBLE, @@ -38,7 +37,7 @@ enum Style }; const int NUM_DANCE_STYLES = 7; -const int NUM_PUMP_STYLES = 6; +const int NUM_PUMP_STYLES = 5; const int NUM_EZ2_STYLES = 7; const int NUM_PARA_STYLES = 1;