From f5cd95b4f93ad952e64096981ef3662a9823f142 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Thu, 7 Aug 2003 06:16:17 +0000 Subject: [PATCH] NotesType => StepsType --- stepmania/src/Course.cpp | 12 ++--- stepmania/src/Course.h | 8 ++-- stepmania/src/DifficultyDisplay.cpp | 2 +- stepmania/src/DifficultyDisplay.h | 2 +- stepmania/src/EditMenu.cpp | 2 +- stepmania/src/EditMenu.h | 10 ++-- stepmania/src/GameConstantsAndTypes.h | 32 ++++++------- stepmania/src/GameManager.cpp | 66 +++++++++++++-------------- stepmania/src/GameManager.h | 10 ++-- stepmania/src/GameState.h | 2 +- stepmania/src/MusicWheel.cpp | 4 +- stepmania/src/NoteData.cpp | 20 ++++---- stepmania/src/NotesLoaderBMS.cpp | 26 +++++------ stepmania/src/NotesLoaderDWI.cpp | 22 ++++----- stepmania/src/NotesLoaderKSF.cpp | 8 ++-- stepmania/src/NotesWriterDWI.cpp | 20 ++++---- stepmania/src/ScreenEditMenu.cpp | 4 +- stepmania/src/ScreenEvaluation.cpp | 8 ++-- stepmania/src/ScreenHowToPlay.cpp | 2 +- stepmania/src/ScreenRanking.cpp | 8 ++-- stepmania/src/ScreenRanking.h | 2 +- stepmania/src/Song.cpp | 28 ++++++------ stepmania/src/SongManager.cpp | 10 ++-- stepmania/src/SongManager.h | 2 +- stepmania/src/StepMania.dsp | 8 ++-- stepmania/src/Steps.cpp | 14 +++--- stepmania/src/Steps.h | 8 ++-- stepmania/src/StyleDef.cpp | 2 +- stepmania/src/StyleDef.h | 4 +- stepmania/src/song.h | 22 ++++----- 30 files changed, 183 insertions(+), 185 deletions(-) diff --git a/stepmania/src/Course.cpp b/stepmania/src/Course.cpp index bbcb7d924d..43c2891010 100644 --- a/stepmania/src/Course.cpp +++ b/stepmania/src/Course.cpp @@ -409,7 +409,7 @@ void Course::AutogenNonstopFromGroup( CString sGroupName, vector &apSongs * play that song, even if we're on difficult and harder notes don't exist. (The * exception is a static song entry with a meter range, but that's not very useful.) */ -bool Course::HasDifficult( NotesType nt ) const +bool Course::HasDifficult( StepsType nt ) const { /* Check to see if any songs would change if difficult. */ @@ -447,7 +447,7 @@ bool Course::HasDifficult( NotesType nt ) const return false; } -bool Course::IsPlayableIn( NotesType nt ) const +bool Course::IsPlayableIn( StepsType nt ) const { vector ci; GetCourseInfo( nt, ci ); @@ -455,7 +455,7 @@ bool Course::IsPlayableIn( NotesType nt ) const } -static vector GetFilteredBestSongs( NotesType nt ) +static vector GetFilteredBestSongs( StepsType nt ) { vector vSongsByMostPlayed = SONGMAN->GetBestSongs(); // filter out songs that don't have both medium and hard steps and long ver sons @@ -472,7 +472,7 @@ static vector GetFilteredBestSongs( NotesType nt ) return vSongsByMostPlayed; } -void Course::GetCourseInfo( NotesType nt, vector &ci, int Difficult ) const +void Course::GetCourseInfo( StepsType nt, vector &ci, int Difficult ) const { vector entries = m_entries; @@ -701,7 +701,7 @@ void Course::GetMeterRange( const Info &stage, int& iMeterLowOut, int& iMeterHig bool Course::GetTotalSeconds( float& fSecondsOut ) const { vector ci; - GetCourseInfo( NOTES_TYPE_DANCE_SINGLE, ci ); + GetCourseInfo( STEPS_TYPE_DANCE_SINGLE, ci ); fSecondsOut = 0; for( unsigned i=0; i vHS; for( int p=0; p &ci, int Difficult = -1 ) const; + void GetCourseInfo( StepsType nt, vector &ci, int Difficult = -1 ) const; int GetEstimatedNumStages() const { return m_entries.size(); } - bool HasDifficult( NotesType nt ) const; - bool IsPlayableIn( NotesType nt ) const; + bool HasDifficult( StepsType nt ) const; + bool IsPlayableIn( StepsType nt ) const; RageColor GetColor() const; Difficulty GetDifficulty( const Info &stage ) const; void GetMeterRange( const Info &stage, int& iMeterLowOut, int& iMeterHighOut ) const; @@ -113,7 +113,7 @@ public: float fSurviveTime; } m_MemCardScores[NUM_MEMORY_CARDS][NUM_NOTES_TYPES]; - void AddScores( NotesType nt, bool bPlayerEnabled[NUM_PLAYERS], int iDancePoints[NUM_PLAYERS], float fSurviveTime[NUM_PLAYERS], int iRankingIndexOut[NUM_PLAYERS], bool bNewRecordOut[NUM_PLAYERS] ); // iNewRecordIndexOut[p] = -1 if not a new record + void AddScores( StepsType nt, bool bPlayerEnabled[NUM_PLAYERS], int iDancePoints[NUM_PLAYERS], float fSurviveTime[NUM_PLAYERS], int iRankingIndexOut[NUM_PLAYERS], bool bNewRecordOut[NUM_PLAYERS] ); // iNewRecordIndexOut[p] = -1 if not a new record // sorting values int SortOrder_TotalDifficulty; diff --git a/stepmania/src/DifficultyDisplay.cpp b/stepmania/src/DifficultyDisplay.cpp index 7459b6d6be..07a998746a 100644 --- a/stepmania/src/DifficultyDisplay.cpp +++ b/stepmania/src/DifficultyDisplay.cpp @@ -31,7 +31,7 @@ DifficultyDisplay::DifficultyDisplay() } } -void DifficultyDisplay::SetDifficulties( const Song* pSong, NotesType curType ) +void DifficultyDisplay::SetDifficulties( const Song* pSong, StepsType curType ) { for( int diff = DIFFICULTY_BEGINNER; diff <= DIFFICULTY_CHALLENGE; ++diff ) { diff --git a/stepmania/src/DifficultyDisplay.h b/stepmania/src/DifficultyDisplay.h index d29554308f..2af00d9390 100644 --- a/stepmania/src/DifficultyDisplay.h +++ b/stepmania/src/DifficultyDisplay.h @@ -22,7 +22,7 @@ class DifficultyDisplay : public ActorFrame { public: DifficultyDisplay(); - void SetDifficulties( const Song* pSong, NotesType curType ); + void SetDifficulties( const Song* pSong, StepsType curType ); void UnsetDifficulties(); protected: diff --git a/stepmania/src/EditMenu.cpp b/stepmania/src/EditMenu.cpp index 76631d1528..ca25ba823d 100644 --- a/stepmania/src/EditMenu.cpp +++ b/stepmania/src/EditMenu.cpp @@ -124,7 +124,7 @@ EditMenu::EditMenu() m_iSelection[ROW_SONG] = i; OnRowValueChanged( ROW_SONG ); - // Select the current NotesType and difficulty if any + // Select the current StepsType and difficulty if any if( GAMESTATE->m_pCurNotes ) { for( i=0; i m_NotesTypes; + vector m_NotesTypes; vector m_pSongs; vector m_Actions; diff --git a/stepmania/src/GameConstantsAndTypes.h b/stepmania/src/GameConstantsAndTypes.h index 50c5cbc641..76572bbf85 100644 --- a/stepmania/src/GameConstantsAndTypes.h +++ b/stepmania/src/GameConstantsAndTypes.h @@ -61,24 +61,24 @@ CString DifficultyToString( Difficulty dc ); Difficulty StringToDifficulty( CString sDC ); -enum NotesType +enum StepsType { - NOTES_TYPE_DANCE_SINGLE = 0, - NOTES_TYPE_DANCE_DOUBLE, - NOTES_TYPE_DANCE_COUPLE, - NOTES_TYPE_DANCE_SOLO, - NOTES_TYPE_PUMP_SINGLE, - NOTES_TYPE_PUMP_HALFDOUBLE, - NOTES_TYPE_PUMP_DOUBLE, - NOTES_TYPE_PUMP_COUPLE, - NOTES_TYPE_EZ2_SINGLE, - NOTES_TYPE_EZ2_DOUBLE, - NOTES_TYPE_EZ2_REAL, - NOTES_TYPE_PARA_SINGLE, - NOTES_TYPE_DS3DDX_SINGLE, - NOTES_TYPE_BM_SINGLE, + STEPS_TYPE_DANCE_SINGLE = 0, + STEPS_TYPE_DANCE_DOUBLE, + STEPS_TYPE_DANCE_COUPLE, + STEPS_TYPE_DANCE_SOLO, + STEPS_TYPE_PUMP_SINGLE, + STEPS_TYPE_PUMP_HALFDOUBLE, + STEPS_TYPE_PUMP_DOUBLE, + STEPS_TYPE_PUMP_COUPLE, + STEPS_TYPE_EZ2_SINGLE, + STEPS_TYPE_EZ2_DOUBLE, + STEPS_TYPE_EZ2_REAL, + STEPS_TYPE_PARA_SINGLE, + STEPS_TYPE_DS3DDX_SINGLE, + STEPS_TYPE_BM_SINGLE, NUM_NOTES_TYPES, // leave this at the end - NOTES_TYPE_INVALID, + STEPS_TYPE_INVALID, }; // diff --git a/stepmania/src/GameManager.cpp b/stepmania/src/GameManager.cpp index f4ef94e675..c17ebbf7ce 100644 --- a/stepmania/src/GameManager.cpp +++ b/stepmania/src/GameManager.cpp @@ -637,7 +637,7 @@ StyleDef g_StyleDefs[NUM_STYLES] = true, // m_bUsedForGameplay true, // m_bUsedForEdit "single", // m_szName - NOTES_TYPE_DANCE_SINGLE, // m_NotesType + STEPS_TYPE_DANCE_SINGLE, // m_NotesType StyleDef::ONE_PLAYER_ONE_CREDIT, // m_StyleType { 160, 480 }, // m_iCenterX 4, // m_iColsPerPlayer @@ -664,7 +664,7 @@ StyleDef g_StyleDefs[NUM_STYLES] = true, // m_bUsedForGameplay false, // m_bUsedForEdit "versus", // m_szName - NOTES_TYPE_DANCE_SINGLE, // m_NotesType + STEPS_TYPE_DANCE_SINGLE, // m_NotesType StyleDef::TWO_PLAYERS_TWO_CREDITS, // m_StyleType { 160, 480 }, // m_iCenterX 4, // m_iColsPerPlayer @@ -691,7 +691,7 @@ StyleDef g_StyleDefs[NUM_STYLES] = true, // m_bUsedForGameplay true, // m_bUsedForEdit "double", // m_szName - NOTES_TYPE_DANCE_DOUBLE, // m_NotesType + STEPS_TYPE_DANCE_DOUBLE, // m_NotesType StyleDef::ONE_PLAYER_TWO_CREDITS, // m_StyleType { 320, 320 }, // m_iCenterX 8, // m_iColsPerPlayer @@ -726,7 +726,7 @@ StyleDef g_StyleDefs[NUM_STYLES] = true, // m_bUsedForGameplay false, // m_bUsedForEdit "couple", // m_szName - NOTES_TYPE_DANCE_COUPLE, // m_NotesType + STEPS_TYPE_DANCE_COUPLE, // m_NotesType StyleDef::TWO_PLAYERS_TWO_CREDITS, // m_StyleType { 160, 480 }, // m_iCenterX 4, // m_iColsPerPlayer @@ -753,7 +753,7 @@ StyleDef g_StyleDefs[NUM_STYLES] = true, // m_bUsedForGameplay true, // m_bUsedForEdit "solo", // m_szName - NOTES_TYPE_DANCE_SOLO, // m_NotesType + STEPS_TYPE_DANCE_SOLO, // m_NotesType StyleDef::ONE_PLAYER_ONE_CREDIT, // m_StyleType { 320, 320 }, // m_iCenterX 6, // m_iColsPerPlayer @@ -784,7 +784,7 @@ StyleDef g_StyleDefs[NUM_STYLES] = false, // m_bUsedForGameplay true, // m_bUsedForEdit "couple (edit)", // m_szName - NOTES_TYPE_DANCE_COUPLE, // m_NotesType + STEPS_TYPE_DANCE_COUPLE, // m_NotesType StyleDef::ONE_PLAYER_ONE_CREDIT, // m_StyleType { 160, 480 }, // m_iCenterX 8, // m_iColsPerPlayer @@ -816,7 +816,7 @@ StyleDef g_StyleDefs[NUM_STYLES] = }, /* { // STYLE_DANCE_SOLO_VERSUS "dance-solo-versus", // m_szName - NOTES_TYPE_DANCE_SOLO, // m_NotesType + STEPS_TYPE_DANCE_SOLO, // m_NotesType StyleDef::ONE_PLAYER_ONE_CREDIT, // m_StyleType { 160, 480 }, // m_iCenterX 6, // m_iColsPerPlayer @@ -847,7 +847,7 @@ StyleDef g_StyleDefs[NUM_STYLES] = true, // m_bUsedForGameplay true, // m_bUsedForEdit "single", // m_szName - NOTES_TYPE_PUMP_SINGLE, // m_NotesType + STEPS_TYPE_PUMP_SINGLE, // m_NotesType StyleDef::ONE_PLAYER_ONE_CREDIT, // m_StyleType { 160, 480 }, // m_iCenterX 5, // m_iColsPerPlayer @@ -876,7 +876,7 @@ StyleDef g_StyleDefs[NUM_STYLES] = true, // m_bUsedForGameplay false, // m_bUsedForEdit "versus", // m_szName - NOTES_TYPE_PUMP_SINGLE, // m_NotesType + STEPS_TYPE_PUMP_SINGLE, // m_NotesType StyleDef::TWO_PLAYERS_TWO_CREDITS, // m_StyleType { 160, 480 }, // m_iCenterX 5, // m_iColsPerPlayer @@ -905,7 +905,7 @@ StyleDef g_StyleDefs[NUM_STYLES] = true, // m_bUsedForGameplay true, // m_bUsedForEdit "halfdouble", // m_szName - NOTES_TYPE_PUMP_HALFDOUBLE, // m_NotesType + STEPS_TYPE_PUMP_HALFDOUBLE, // m_NotesType StyleDef::ONE_PLAYER_TWO_CREDITS, // m_StyleType { 320, 320 }, // m_iCenterX 6, // m_iColsPerPlayer @@ -936,7 +936,7 @@ StyleDef g_StyleDefs[NUM_STYLES] = true, // m_bUsedForGameplay true, // m_bUsedForEdit "double", // m_szName - NOTES_TYPE_PUMP_DOUBLE, // m_NotesType + STEPS_TYPE_PUMP_DOUBLE, // m_NotesType StyleDef::ONE_PLAYER_TWO_CREDITS, // m_StyleType { 320, 320 }, // m_iCenterX 10, // m_iColsPerPlayer @@ -975,7 +975,7 @@ StyleDef g_StyleDefs[NUM_STYLES] = true, // m_bUsedForGameplay false, // m_bUsedForEdit "couple", // m_szName - NOTES_TYPE_PUMP_COUPLE, // m_NotesType + STEPS_TYPE_PUMP_COUPLE, // m_NotesType StyleDef::TWO_PLAYERS_TWO_CREDITS, // m_StyleType { 160, 480 }, // m_iCenterX 5, // m_iColsPerPlayer @@ -1004,7 +1004,7 @@ StyleDef g_StyleDefs[NUM_STYLES] = false, // m_bUsedForGameplay true, // m_bUsedForEdit "couple (edit)", // m_szName - NOTES_TYPE_PUMP_COUPLE, // m_NotesType + STEPS_TYPE_PUMP_COUPLE, // m_NotesType StyleDef::ONE_PLAYER_ONE_CREDIT, // m_StyleType { 160, 480 }, // m_iCenterX 10, // m_iColsPerPlayer @@ -1038,7 +1038,7 @@ StyleDef g_StyleDefs[NUM_STYLES] = true, // m_bUsedForGameplay true, // m_bUsedForEdit "single", // m_szName - NOTES_TYPE_EZ2_SINGLE, // m_NotesType + STEPS_TYPE_EZ2_SINGLE, // m_NotesType StyleDef::ONE_PLAYER_ONE_CREDIT, // m_StyleType { 160, 480 }, // m_iCenterX 5, // m_iColsPerPlayer @@ -1067,7 +1067,7 @@ StyleDef g_StyleDefs[NUM_STYLES] = true, // m_bUsedForGameplay true, // m_bUsedForEdit "real", // m_szName - NOTES_TYPE_EZ2_REAL, // m_NotesType + STEPS_TYPE_EZ2_REAL, // m_NotesType StyleDef::ONE_PLAYER_ONE_CREDIT, // m_StyleType { 160, 480 }, // m_iCenterX 7, // m_iColsPerPlayer @@ -1100,7 +1100,7 @@ StyleDef g_StyleDefs[NUM_STYLES] = true, // m_bUsedForGameplay true, // m_bUsedForEdit "versus", // m_szName - NOTES_TYPE_EZ2_SINGLE, // m_NotesType + STEPS_TYPE_EZ2_SINGLE, // m_NotesType StyleDef::TWO_PLAYERS_TWO_CREDITS, // m_StyleType { 160, 480 }, // m_iCenterX 5, // m_iColsPerPlayer @@ -1129,7 +1129,7 @@ StyleDef g_StyleDefs[NUM_STYLES] = true, // m_bUsedForGameplay true, // m_bUsedForEdit "versusReal", // m_szName - NOTES_TYPE_EZ2_REAL, // m_NotesType + STEPS_TYPE_EZ2_REAL, // m_NotesType StyleDef::TWO_PLAYERS_TWO_CREDITS, // m_StyleType { 160, 480 }, // m_iCenterX 7, // m_iColsPerPlayer @@ -1162,7 +1162,7 @@ StyleDef g_StyleDefs[NUM_STYLES] = true, // m_bUsedForGameplay true, // m_bUsedForEdit "double", // m_szName - NOTES_TYPE_EZ2_DOUBLE, // m_NotesType + STEPS_TYPE_EZ2_DOUBLE, // m_NotesType StyleDef::ONE_PLAYER_ONE_CREDIT, // m_StyleType { 320, 320 }, // m_iCenterX 10, // m_iColsPerPlayer @@ -1201,7 +1201,7 @@ StyleDef g_StyleDefs[NUM_STYLES] = true, // m_bUsedForGameplay true, // m_bUsedForEdit "single", // m_szName - NOTES_TYPE_PARA_SINGLE, // m_NotesType + STEPS_TYPE_PARA_SINGLE, // m_NotesType StyleDef::ONE_PLAYER_ONE_CREDIT, // m_StyleType { 320, 320 }, // m_iCenterX 5, // m_iColsPerPlayer @@ -1230,7 +1230,7 @@ StyleDef g_StyleDefs[NUM_STYLES] = true, // m_bUsedForGameplay true, // m_bUsedForEdit "single", // m_szName - NOTES_TYPE_DS3DDX_SINGLE, // m_NotesType + STEPS_TYPE_DS3DDX_SINGLE, // m_NotesType StyleDef::ONE_PLAYER_ONE_CREDIT, // m_StyleType { 160, 480 }, // m_iCenterX 8, // m_iColsPerPlayer @@ -1265,7 +1265,7 @@ StyleDef g_StyleDefs[NUM_STYLES] = true, // m_bUsedForGameplay true, // m_bUsedForEdit "BM-single", // m_szName - NOTES_TYPE_BM_SINGLE, // m_NotesType + STEPS_TYPE_BM_SINGLE, // m_NotesType StyleDef::ONE_PLAYER_ONE_CREDIT, // m_StyleType { 160, 480 }, // m_iCenterX 6, // m_iColsPerPlayer @@ -1591,7 +1591,7 @@ void GameManager::GetStylesForGame( Game game, vector