From 0160e2370528d0fe003655706ef9f977d38d84fc Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Fri, 23 Feb 2007 22:29:42 +0000 Subject: [PATCH] style cleanup: use FOREACH_ENUM( X, x ) everywhere instead of FOREACH_X( x ) for consistency The FOREACH_X defines are not very useful, and they were created back before FOREACH_ENUM was convenient. --- stepmania/src/CatalogXml.cpp | 10 +++---- stepmania/src/Course.cpp | 8 +++--- stepmania/src/CourseLoaderCRS.cpp | 2 +- stepmania/src/CourseUtil.cpp | 4 +-- stepmania/src/CourseWriterCRS.cpp | 2 +- stepmania/src/Difficulty.cpp | 2 +- stepmania/src/Difficulty.h | 3 +- stepmania/src/EditMenu.cpp | 4 +-- stepmania/src/GameConstantsAndTypes.h | 14 ---------- stepmania/src/GameManager.cpp | 2 +- stepmania/src/GameState.cpp | 4 +-- stepmania/src/Grade.h | 1 - stepmania/src/HighScore.cpp | 12 ++++---- stepmania/src/MusicWheel.cpp | 4 +-- stepmania/src/NoteDataUtil.cpp | 2 +- stepmania/src/NoteDataWithScoring.cpp | 2 +- stepmania/src/NotesLoaderBMS.cpp | 4 +-- stepmania/src/NotesLoaderSM.cpp | 2 +- stepmania/src/NotesWriterSM.cpp | 2 +- stepmania/src/OptionRowHandler.cpp | 2 +- stepmania/src/PlayerStageStats.cpp | 16 +++++------ stepmania/src/Profile.cpp | 38 +++++++++++++------------- stepmania/src/RadarValues.cpp | 10 +++---- stepmania/src/RadarValues.h | 4 +-- stepmania/src/ScoreDisplayLifeTime.cpp | 4 +-- stepmania/src/ScreenDebugOverlay.cpp | 6 ++-- stepmania/src/ScreenEdit.cpp | 2 +- stepmania/src/ScreenJukebox.cpp | 2 +- stepmania/src/Song.cpp | 12 ++++---- stepmania/src/SongManager.cpp | 4 +-- stepmania/src/SongUtil.cpp | 4 +-- stepmania/src/StageStats.cpp | 4 +-- stepmania/src/UnlockManager.cpp | 8 +++--- 33 files changed, 92 insertions(+), 108 deletions(-) diff --git a/stepmania/src/CatalogXml.cpp b/stepmania/src/CatalogXml.cpp index 9918c5c70b..250c3e2f46 100644 --- a/stepmania/src/CatalogXml.cpp +++ b/stepmania/src/CatalogXml.cpp @@ -117,7 +117,7 @@ void CatalogXml::Save( LoadingWindow *loading_window ) iNumStepsInGroupAndStepsType[pSteps->GetDifficulty()]++; } } - FOREACH_Difficulty( dc ) + FOREACH_ENUM( Difficulty, dc ) p3->AppendChild( DifficultyToString(dc), iNumStepsInGroupAndStepsType[dc] ); } @@ -299,7 +299,7 @@ void CatalogXml::Save( LoadingWindow *loading_window ) { XNode* pNode2 = pNode->AppendChild( "PlayMode" ); - FOREACH_PlayMode( pm ) + FOREACH_ENUM( PlayMode, pm ) { if( !SHOW_PLAY_MODE(pm) ) continue; @@ -343,7 +343,7 @@ void CatalogXml::Save( LoadingWindow *loading_window ) { XNode* pNode2 = pNode->AppendChild( "TapNoteScore" ); - FOREACH_TapNoteScore( tns ) + FOREACH_ENUM( TapNoteScore, tns ) { XNode* pNode3 = pNode2->AppendChild( "TapNoteScore", TapNoteScoreToString(tns) ); pNode3->AppendAttr( "DisplayAs", TapNoteScoreToLocalizedString(tns) ); @@ -352,7 +352,7 @@ void CatalogXml::Save( LoadingWindow *loading_window ) { XNode* pNode2 = pNode->AppendChild( "HoldNoteScore" ); - FOREACH_HoldNoteScore( hns ) + FOREACH_ENUM( HoldNoteScore, hns ) { XNode* pNode3 = pNode2->AppendChild( "HoldNoteScore", HoldNoteScoreToString(hns) ); pNode3->AppendAttr( "DisplayAs", HoldNoteScoreToLocalizedString(hns) ); @@ -361,7 +361,7 @@ void CatalogXml::Save( LoadingWindow *loading_window ) { XNode* pNode2 = pNode->AppendChild( "RadarValue" ); - FOREACH_RadarCategory( rc ) + FOREACH_ENUM( RadarCategory, rc ) { XNode* pNode3 = pNode2->AppendChild( "RadarValue", RadarCategoryToString(rc) ); pNode3->AppendAttr( "DisplayAs", RadarCategoryToLocalizedString(rc) ); diff --git a/stepmania/src/Course.cpp b/stepmania/src/Course.cpp index f8bc1c83b5..708471fcb4 100644 --- a/stepmania/src/Course.cpp +++ b/stepmania/src/Course.cpp @@ -206,7 +206,7 @@ void Course::Init() m_bRepeat = false; m_bShuffle = false; m_iLives = -1; - FOREACH_Difficulty(dc) + FOREACH_ENUM( Difficulty,dc) m_iCustomMeter[dc] = -1; m_bSortByMeter = false; @@ -691,7 +691,7 @@ void Course::Invalidate( const Song *pStaleSong ) // If we find a Trail that contains this song, then it's part of a // non-fixed entry. So, regenerating the Trail will force different // songs to be chosen. - FOREACH_StepsType( st ) + FOREACH_ENUM( StepsType,st ) { FOREACH_ShownCourseDifficulty( cd ) { @@ -860,9 +860,9 @@ bool Course::ShowInDemonstrationAndRanking() const void Course::CalculateRadarValues() { - FOREACH_StepsType( st ) + FOREACH_ENUM( StepsType,st ) { - FOREACH_CourseDifficulty( cd ) + FOREACH_ENUM( CourseDifficulty,cd ) { // For courses that aren't fixed, the radar values are meaningless. // Makes non-fixed courses have unknown radar values. diff --git a/stepmania/src/CourseLoaderCRS.cpp b/stepmania/src/CourseLoaderCRS.cpp index c47a2a5ceb..a84079dd46 100644 --- a/stepmania/src/CourseLoaderCRS.cpp +++ b/stepmania/src/CourseLoaderCRS.cpp @@ -29,7 +29,7 @@ const char *g_CRSDifficultyNames[] = static CourseDifficulty CRSStringToDifficulty( const RString& s ) { - FOREACH_Difficulty(i) + FOREACH_ENUM( Difficulty,i) if( !s.CompareNoCase(g_CRSDifficultyNames[i]) ) return i; return Difficulty_Invalid; diff --git a/stepmania/src/CourseUtil.cpp b/stepmania/src/CourseUtil.cpp index 103e493c65..670094d654 100644 --- a/stepmania/src/CourseUtil.cpp +++ b/stepmania/src/CourseUtil.cpp @@ -206,7 +206,7 @@ void CourseUtil::AutogenEndlessFromGroup( const RString &sGroupName, Difficulty out.m_bRepeat = true; out.m_bShuffle = true; out.m_iLives = -1; - FOREACH_Difficulty(dc) + FOREACH_ENUM( Difficulty,dc) out.m_iCustomMeter[dc] = -1; if( sGroupName == "" ) @@ -257,7 +257,7 @@ void CourseUtil::AutogenOniFromArtist( const RString &sArtistName, RString sArti out.m_bSortByMeter = true; out.m_iLives = 4; - FOREACH_Difficulty(cd) + FOREACH_ENUM( Difficulty,cd) out.m_iCustomMeter[cd] = -1; ASSERT( sArtistName != "" ); diff --git a/stepmania/src/CourseWriterCRS.cpp b/stepmania/src/CourseWriterCRS.cpp index b740e124e6..abd2633e18 100644 --- a/stepmania/src/CourseWriterCRS.cpp +++ b/stepmania/src/CourseWriterCRS.cpp @@ -45,7 +45,7 @@ bool CourseWriterCRS::Write( const Course &course, RageFileBasic &f, bool bSavin if( course.m_iLives != -1 ) f.PutLine( ssprintf("#LIVES:%i;", course.m_iLives) ); - FOREACH_CourseDifficulty( cd ) + FOREACH_ENUM( CourseDifficulty,cd ) { if( course.m_iCustomMeter[cd] == -1 ) continue; diff --git a/stepmania/src/Difficulty.cpp b/stepmania/src/Difficulty.cpp index b12c094cb3..277401cf2b 100644 --- a/stepmania/src/Difficulty.cpp +++ b/stepmania/src/Difficulty.cpp @@ -56,7 +56,7 @@ const RString &CourseDifficultyToLocalizedString( CourseDifficulty x ) static auto_ptr g_CourseDifficultyName[NUM_Difficulty]; if( g_CourseDifficultyName[0].get() == NULL ) { - FOREACH_Difficulty(i) + FOREACH_ENUM( Difficulty,i) { auto_ptr ap( new LocalizedString("CourseDifficulty", DifficultyToString(i)) ); g_CourseDifficultyName[i] = ap; diff --git a/stepmania/src/Difficulty.h b/stepmania/src/Difficulty.h index f3d42aa1e0..a88b0e4f89 100644 --- a/stepmania/src/Difficulty.h +++ b/stepmania/src/Difficulty.h @@ -17,7 +17,6 @@ enum Difficulty NUM_Difficulty, Difficulty_Invalid }; -#define FOREACH_Difficulty( dc ) FOREACH_ENUM( Difficulty, dc ) const RString& DifficultyToString( Difficulty dc ); const RString& DifficultyToLocalizedString( Difficulty dc ); Difficulty StringToDifficulty( const RString& sDC ); @@ -25,7 +24,7 @@ LuaDeclareType( Difficulty ); typedef Difficulty CourseDifficulty; -#define FOREACH_CourseDifficulty FOREACH_Difficulty +const int NUM_CourseDifficulty = NUM_Difficulty; #define FOREACH_ShownCourseDifficulty( cd ) for( Difficulty cd=GetNextShownCourseDifficulty((CourseDifficulty)-1); cd!=Difficulty_Invalid; cd=GetNextShownCourseDifficulty(cd) ) const RString& CourseDifficultyToLocalizedString( Difficulty dc ); diff --git a/stepmania/src/EditMenu.cpp b/stepmania/src/EditMenu.cpp index 08fd3dffbb..a1d4abcf3e 100644 --- a/stepmania/src/EditMenu.cpp +++ b/stepmania/src/EditMenu.cpp @@ -398,7 +398,7 @@ void EditMenu::OnRowValueChanged( EditMenuRow row ) m_vpSteps.clear(); - FOREACH_Difficulty( dc ) + FOREACH_ENUM( Difficulty, dc ) { if( dc == Difficulty_Edit ) { @@ -507,7 +507,7 @@ void EditMenu::OnRowValueChanged( EditMenuRow row ) m_vpSourceSteps.clear(); m_vpSourceSteps.push_back( StepsAndDifficulty(NULL,Difficulty_Invalid) ); // "blank" - FOREACH_Difficulty( dc ) + FOREACH_ENUM( Difficulty, dc ) { // fill in m_vpSourceSteps if( dc != Difficulty_Edit ) diff --git a/stepmania/src/GameConstantsAndTypes.h b/stepmania/src/GameConstantsAndTypes.h index 6f23691a64..f1f8735974 100644 --- a/stepmania/src/GameConstantsAndTypes.h +++ b/stepmania/src/GameConstantsAndTypes.h @@ -32,7 +32,6 @@ enum RadarCategory NUM_RadarCategory, // leave this at the end RadarCategory_Invalid }; -#define FOREACH_RadarCategory( rc ) FOREACH_ENUM( RadarCategory, rc ) const RString& RadarCategoryToString( RadarCategory cat ); const RString& RadarCategoryToLocalizedString( RadarCategory cat ); LuaDeclareType( RadarCategory ); @@ -73,7 +72,6 @@ enum StepsType NUM_StepsType, // leave this at the end StepsType_Invalid, }; -#define FOREACH_StepsType( st ) FOREACH_ENUM( StepsType, st ) LuaDeclareType( StepsType ); // @@ -90,7 +88,6 @@ enum PlayMode NUM_PlayMode, PlayMode_Invalid }; -#define FOREACH_PlayMode( pm ) FOREACH_ENUM( PlayMode, pm ) const RString& PlayModeToString( PlayMode pm ); const RString& PlayModeToLocalizedString( PlayMode pm ); PlayMode StringToPlayMode( const RString& s ); @@ -123,7 +120,6 @@ enum SortOrder SortOrder_Invalid }; const SortOrder MAX_SELECTABLE_SORT = (SortOrder)(SORT_ROULETTE-1); -#define FOREACH_SortOrder( so ) FOREACH_ENUM( SortOrder, so ) const RString& SortOrderToString( SortOrder so ); SortOrder StringToSortOrder( const RString& str ); LuaDeclareType( SortOrder ); @@ -147,7 +143,6 @@ enum TapNoteScore { NUM_TapNoteScore, TapNoteScore_Invalid, }; -#define FOREACH_TapNoteScore( tns ) FOREACH_ENUM( TapNoteScore, tns ) const RString& TapNoteScoreToString( TapNoteScore tns ); const RString& TapNoteScoreToLocalizedString( TapNoteScore tns ); TapNoteScore StringToTapNoteScore( const RString& str ); @@ -162,7 +157,6 @@ enum HoldNoteScore NUM_HoldNoteScore, HoldNoteScore_Invalid, }; -#define FOREACH_HoldNoteScore( hns ) FOREACH_ENUM( HoldNoteScore, hns ) const RString& HoldNoteScoreToString( HoldNoteScore hns ); const RString& HoldNoteScoreToLocalizedString( HoldNoteScore hns ); HoldNoteScore StringToHoldNoteScore( const RString& str ); @@ -220,7 +214,6 @@ enum ProfileSlot NUM_ProfileSlot, ProfileSlot_Invalid }; -#define FOREACH_ProfileSlot( slot ) FOREACH_ENUM( ProfileSlot, slot ) enum MemoryCardState @@ -250,7 +243,6 @@ enum RankingCategory NUM_RankingCategory, RankingCategory_Invalid }; -#define FOREACH_RankingCategory( rc ) FOREACH_ENUM( RankingCategory, rc ) const RString& RankingCategoryToString( RankingCategory rc ); RankingCategory StringToRankingCategory( const RString& rc ); @@ -315,7 +307,6 @@ enum CoinMode NUM_CoinMode, CoinMode_Invalid }; -#define FOREACH_CoinMode( i ) FOREACH_ENUM( CoinMode, i ) const RString& CoinModeToString( CoinMode cm ); LuaDeclareType( CoinMode ); @@ -331,7 +322,6 @@ enum Premium NUM_Premium, Premium_Invalid }; -#define FOREACH_Premium( i ) FOREACH_ENUM( Premium, i ) const RString& PremiumToString( Premium p ); LuaDeclareType( Premium ); @@ -355,7 +345,6 @@ enum PerDifficultyAward NUM_PerDifficultyAward, PerDifficultyAward_Invalid, }; -#define FOREACH_PerDifficultyAward( pma ) FOREACH_ENUM( PerDifficultyAward, pma ) const RString& PerDifficultyAwardToString( PerDifficultyAward pma ); const RString& PerDifficultyAwardToLocalizedString( PerDifficultyAward pma ); PerDifficultyAward StringToPerDifficultyAward( const RString& pma ); @@ -377,7 +366,6 @@ enum PeakComboAward NUM_PeakComboAward, PeakComboAward_Invalid, }; -#define FOREACH_PeakComboAward( pca ) FOREACH_ENUM( PeakComboAward, pca ) const RString& PeakComboAwardToString( PeakComboAward pma ); const RString& PeakComboAwardToLocalizedString( PeakComboAward pma ); PeakComboAward StringToPeakComboAward( const RString& pma ); @@ -416,7 +404,6 @@ enum GoalType NUM_GoalType, GoalType_Invalid, }; -#define FOREACH_GoalType( gt ) FOREACH_ENUM( GoalType, gt ) const RString& GoalTypeToString( GoalType gt ); GoalType StringToGoalType( const RString& s ); LuaDeclareType( GoalType ); @@ -454,7 +441,6 @@ enum Stage NUM_Stage, Stage_Invalid, }; -#define FOREACH_Stage( s ) FOREACH_ENUM( Stage, s ) const RString& StageToString( Stage s ); LuaDeclareType( Stage ); diff --git a/stepmania/src/GameManager.cpp b/stepmania/src/GameManager.cpp index e3de12dfe5..66a4d6bd36 100644 --- a/stepmania/src/GameManager.cpp +++ b/stepmania/src/GameManager.cpp @@ -2293,7 +2293,7 @@ const Style* GameManager::GetEditorStyleForStepsType( StepsType st ) const void GameManager::GetStepsTypesForGame( const Game *pGame, vector& aStepsTypeAddTo ) const { - FOREACH_StepsType( st ) + FOREACH_ENUM( StepsType, st ) { bool found = false; for( unsigned s=0; !found && s &asFeatsOu // Find Machine Category Records - FOREACH_RankingCategory( rc ) + FOREACH_ENUM( RankingCategory, rc ) { HighScoreList &hsl = PROFILEMAN->GetMachineProfile()->GetCategoryHighScoreList( st, rc ); for( unsigned j=0; j &asFeatsOu } // Find Personal Category Records - FOREACH_RankingCategory( rc ) + FOREACH_ENUM( RankingCategory, rc ) { if( pProf ) { diff --git a/stepmania/src/Grade.h b/stepmania/src/Grade.h index e7d2d58a08..f2d1ff3664 100644 --- a/stepmania/src/Grade.h +++ b/stepmania/src/Grade.h @@ -53,7 +53,6 @@ RString GradeToOldString( Grade g ); // "AAA", "B", etc for backward compatibili RString GradeToLocalizedString( Grade g ); Grade StringToGrade( const RString &s ); LuaDeclareType( Grade ); -#define FOREACH_Grade( g ) FOREACH_ENUM( Grade, g ) #define FOREACH_UsedGrade( g ) FOREACH_ENUM_N( Grade, THEME->GetMetricI("PlayerStageStats","NumGradeTiersUsed"), g ) #endif diff --git a/stepmania/src/HighScore.cpp b/stepmania/src/HighScore.cpp index 448b89de13..63e3a1c118 100644 --- a/stepmania/src/HighScore.cpp +++ b/stepmania/src/HighScore.cpp @@ -48,9 +48,9 @@ bool HighScoreImpl::operator==( const HighScoreImpl& other ) const COMPARE( sPlayerGuid ); COMPARE( sMachineGuid ); COMPARE( iProductID ); - FOREACH_TapNoteScore( tns ) + FOREACH_ENUM( TapNoteScore, tns ) COMPARE( iTapNoteScores[tns] ); - FOREACH_HoldNoteScore( hns ) + FOREACH_ENUM( HoldNoteScore, hns ) COMPARE( iHoldNoteScores[hns] ); COMPARE( radarValues ); COMPARE( fLifeRemainingSeconds ); @@ -95,11 +95,11 @@ XNode *HighScoreImpl::CreateNode() const pNode->AppendChild( "MachineGuid", sMachineGuid ); pNode->AppendChild( "ProductID", iProductID ); XNode* pTapNoteScores = pNode->AppendChild( "TapNoteScores" ); - FOREACH_TapNoteScore( tns ) + FOREACH_ENUM( TapNoteScore, tns ) if( tns != TNS_None ) // HACK: don't save meaningless "none" count pTapNoteScores->AppendChild( TapNoteScoreToString(tns), iTapNoteScores[tns] ); XNode* pHoldNoteScores = pNode->AppendChild( "HoldNoteScores" ); - FOREACH_HoldNoteScore( hns ) + FOREACH_ENUM( HoldNoteScore, hns ) if( hns != HNS_None ) // HACK: don't save meaningless "none" count pHoldNoteScores->AppendChild( HoldNoteScoreToString(hns), iHoldNoteScores[hns] ); pNode->AppendChild( radarValues.CreateNode(bWriteSimpleValues, bWriteComplexValues) ); @@ -127,11 +127,11 @@ void HighScoreImpl::LoadFromNode( const XNode *pNode ) pNode->GetChildValue( "ProductID", iProductID ); const XNode* pTapNoteScores = pNode->GetChild( "TapNoteScores" ); if( pTapNoteScores ) - FOREACH_TapNoteScore( tns ) + FOREACH_ENUM( TapNoteScore, tns ) pTapNoteScores->GetChildValue( TapNoteScoreToString(tns), iTapNoteScores[tns] ); const XNode* pHoldNoteScores = pNode->GetChild( "HoldNoteScores" ); if( pHoldNoteScores ) - FOREACH_HoldNoteScore( hns ) + FOREACH_ENUM( HoldNoteScore, hns ) pHoldNoteScores->GetChildValue( HoldNoteScoreToString(hns), iHoldNoteScores[hns] ); const XNode* pRadarValues = pNode->GetChild( "RadarValues" ); if( pRadarValues ) diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp index ce89dbb022..05c33fe463 100644 --- a/stepmania/src/MusicWheel.cpp +++ b/stepmania/src/MusicWheel.cpp @@ -108,7 +108,7 @@ void MusicWheel::Load( RString sType ) RString times; /* Build all of the wheel item data. Do this after selecting * the extra stage, so it knows to always display it. */ - FOREACH_SortOrder( so ) + FOREACH_ENUM( SortOrder, so ) { BuildWheelItemDatas( m_WheelItemDatas[so], so ); times += ssprintf( "%i:%.3f ", so, timer.GetDeltaTime() ); @@ -187,7 +187,7 @@ void MusicWheel::BeginScreen() MusicWheel::~MusicWheel() { - FOREACH_SortOrder( so ) + FOREACH_ENUM( SortOrder, so ) FOREACH( WheelItemData*, m_WheelItemDatas[so], i ) delete *i; } diff --git a/stepmania/src/NoteDataUtil.cpp b/stepmania/src/NoteDataUtil.cpp index bc520ea11c..3f198f1b5d 100644 --- a/stepmania/src/NoteDataUtil.cpp +++ b/stepmania/src/NoteDataUtil.cpp @@ -682,7 +682,7 @@ void NoteDataUtil::CalculateRadarValues( const NoteData &in, float fSongSeconds, { // The for loop and the assert are used to ensure that all fields of // RadarValue get set in here. - FOREACH_RadarCategory( rc ) + FOREACH_ENUM( RadarCategory, rc ) { switch( rc ) { diff --git a/stepmania/src/NoteDataWithScoring.cpp b/stepmania/src/NoteDataWithScoring.cpp index 396bb485c8..ccb9a7fc76 100644 --- a/stepmania/src/NoteDataWithScoring.cpp +++ b/stepmania/src/NoteDataWithScoring.cpp @@ -255,7 +255,7 @@ void NoteDataWithScoring::GetActualRadarValues( const NoteData &in, const Player { // The for loop and the assert are used to ensure that all fields of // RadarValue get set in here. - FOREACH_RadarCategory( rc ) + FOREACH_ENUM( RadarCategory, rc ) { switch( rc ) { diff --git a/stepmania/src/NotesLoaderBMS.cpp b/stepmania/src/NotesLoaderBMS.cpp index c4cee496fb..13c61ca45a 100644 --- a/stepmania/src/NotesLoaderBMS.cpp +++ b/stepmania/src/NotesLoaderBMS.cpp @@ -930,9 +930,9 @@ static void SlideDuplicateDifficulties( Song &p ) * difficulties slid upwards due to (for example) having two beginner steps. * We do a second pass in Song::TidyUpData to eliminate any remaining duplicates * after this. */ - FOREACH_StepsType( st ) + FOREACH_ENUM( StepsType,st ) { - FOREACH_Difficulty( dc ) + FOREACH_ENUM( Difficulty, dc ) { if( dc == Difficulty_Edit ) continue; diff --git a/stepmania/src/NotesLoaderSM.cpp b/stepmania/src/NotesLoaderSM.cpp index 44d5858f02..4100cb1cb6 100644 --- a/stepmania/src/NotesLoaderSM.cpp +++ b/stepmania/src/NotesLoaderSM.cpp @@ -52,7 +52,7 @@ static void LoadFromSMTokens( { RadarValues v[NUM_PLAYERS]; FOREACH_PlayerNumber( pn ) - FOREACH_RadarCategory( rc ) + FOREACH_ENUM( RadarCategory, rc ) v[pn][rc] = StringToFloat( saValues[pn*NUM_RadarCategory + rc] ); out.SetCachedRadarValues( v ); } diff --git a/stepmania/src/NotesWriterSM.cpp b/stepmania/src/NotesWriterSM.cpp index c5f38961ef..6d2fcf7d27 100644 --- a/stepmania/src/NotesWriterSM.cpp +++ b/stepmania/src/NotesWriterSM.cpp @@ -178,7 +178,7 @@ static RString GetSMNotesTag( const Song &song, const Steps &in, bool bSavingCac FOREACH_PlayerNumber( pn ) { const RadarValues &rv = in.GetRadarValues( pn ); - FOREACH_RadarCategory( rc ) + FOREACH_ENUM( RadarCategory, rc ) asRadarValues.push_back( ssprintf("%.3f", rv[rc]) ); } lines.push_back( ssprintf( " %s:", join(",",asRadarValues).c_str() ) ); diff --git a/stepmania/src/OptionRowHandler.cpp b/stepmania/src/OptionRowHandler.cpp index ed1611175e..00f3eadb7a 100644 --- a/stepmania/src/OptionRowHandler.cpp +++ b/stepmania/src/OptionRowHandler.cpp @@ -480,7 +480,7 @@ public: if( GAMESTATE->m_pCurSong ) { - FOREACH_Difficulty( dc ) + FOREACH_ENUM( Difficulty, dc ) { if( dc == Difficulty_Edit ) continue; diff --git a/stepmania/src/PlayerStageStats.cpp b/stepmania/src/PlayerStageStats.cpp index 4d663f64c8..2862bb77a0 100644 --- a/stepmania/src/PlayerStageStats.cpp +++ b/stepmania/src/PlayerStageStats.cpp @@ -136,7 +136,7 @@ Grade GetGradeFromPercent( float fPercent, bool bMerciful ) Grade grade = Grade_Failed; - FOREACH_Grade(g) + FOREACH_ENUM( Grade,g) { if( fPercent >= GRADE_PERCENT_TIER(g) ) { @@ -160,14 +160,14 @@ Grade PlayerStageStats::GetGrade() const if( m_vpPlayedSteps.size() && !GAMESTATE->IsCourseMode() ) bIsBeginner = m_vpPlayedSteps[0]->GetDifficulty() == Difficulty_Beginner; - FOREACH_TapNoteScore( tns ) + FOREACH_ENUM( TapNoteScore, tns ) { int iTapScoreValue = ScoreKeeperNormal::TapNoteScoreToGradePoints( tns, bIsBeginner ); fActual += m_iTapNoteScores[tns] * iTapScoreValue; LOG->Trace( "GetGrade actual: %i * %i", m_iTapNoteScores[tns], iTapScoreValue ); } - FOREACH_HoldNoteScore( hns ) + FOREACH_ENUM( HoldNoteScore, hns ) { int iHoldScoreValue = ScoreKeeperNormal::HoldNoteScoreToGradePoints( hns, bIsBeginner ); fActual += m_iHoldNoteScores[hns] * iHoldScoreValue; @@ -253,7 +253,7 @@ int PlayerStageStats::GetLessonScoreActual() const { int iScore = 0; - FOREACH_TapNoteScore( tns ) + FOREACH_ENUM( TapNoteScore, tns ) { switch( tns ) { @@ -268,7 +268,7 @@ int PlayerStageStats::GetLessonScoreActual() const } } - FOREACH_HoldNoteScore( hns ) + FOREACH_ENUM( HoldNoteScore, hns ) { switch( hns ) { @@ -295,9 +295,9 @@ void PlayerStageStats::ResetScoreForLesson() { m_iCurPossibleDancePoints = 0; m_iActualDancePoints = 0; - FOREACH_TapNoteScore( tns ) + FOREACH_ENUM( TapNoteScore, tns ) m_iTapNoteScores[tns] = 0; - FOREACH_HoldNoteScore( hns ) + FOREACH_ENUM( HoldNoteScore, hns ) m_iHoldNoteScores[hns] = 0; m_iCurCombo = 0; m_iMaxCombo = 0; @@ -600,7 +600,7 @@ void PlayerStageStats::CalcAwards( PlayerNumber p, bool bGaveUp, bool bUsedAutop int iComboAtStartOfStage = GetComboAtStartOfStage(); int iPeakCombo = GetMaxCombo().m_cnt; - FOREACH_PeakComboAward( pca ) + FOREACH_ENUM( PeakComboAward,pca ) { int iLevel = 1000 * (pca+1); bool bCrossedLevel = iComboAtStartOfStage < iLevel && iPeakCombo >= iLevel; diff --git a/stepmania/src/Profile.cpp b/stepmania/src/Profile.cpp index 0fcaacf28a..917d606d6c 100644 --- a/stepmania/src/Profile.cpp +++ b/stepmania/src/Profile.cpp @@ -128,10 +128,10 @@ void Profile::InitGeneralData() m_iTotalMines = 0; m_iTotalHands = 0; - FOREACH_PlayMode( i ) + FOREACH_ENUM( PlayMode, i ) m_iNumSongsPlayedByPlayMode[i] = 0; m_iNumSongsPlayedByStyle.clear(); - FOREACH_Difficulty( i ) + FOREACH_ENUM( Difficulty, i ) m_iNumSongsPlayedByDifficulty[i] = 0; for( int i=0; im_StepsHighScores, it ) { @@ -761,7 +761,7 @@ HighScoreList& Profile::GetCategoryHighScoreList( StepsType st, RankingCategory int Profile::GetCategoryNumTimesPlayed( StepsType st ) const { int iNumTimesPlayed = 0; - FOREACH_RankingCategory( rc ) + FOREACH_ENUM( RankingCategory,rc ) iNumTimesPlayed += m_CategoryHighScores[st][rc].GetNumTimesPlayed(); return iNumTimesPlayed; } @@ -1092,7 +1092,7 @@ XNode* Profile::SaveGeneralDataCreateNode() const { XNode* pNumSongsPlayedByPlayMode = pGeneralDataNode->AppendChild("NumSongsPlayedByPlayMode"); - FOREACH_PlayMode( pm ) + FOREACH_ENUM( PlayMode, pm ) { /* Don't save unplayed PlayModes. */ if( !m_iNumSongsPlayedByPlayMode[pm] ) @@ -1117,7 +1117,7 @@ XNode* Profile::SaveGeneralDataCreateNode() const { XNode* pNumSongsPlayedByDifficulty = pGeneralDataNode->AppendChild("NumSongsPlayedByDifficulty"); - FOREACH_Difficulty( dc ) + FOREACH_ENUM( Difficulty, dc ) { if( !m_iNumSongsPlayedByDifficulty[dc] ) continue; @@ -1139,7 +1139,7 @@ XNode* Profile::SaveGeneralDataCreateNode() const { XNode* pNumStagesPassedByPlayMode = pGeneralDataNode->AppendChild("NumStagesPassedByPlayMode"); - FOREACH_PlayMode( pm ) + FOREACH_ENUM( PlayMode, pm ) { /* Don't save unplayed PlayModes. */ if( !m_iNumStagesPassedByPlayMode[pm] ) @@ -1150,7 +1150,7 @@ XNode* Profile::SaveGeneralDataCreateNode() const { XNode* pNumStagesPassedByGrade = pGeneralDataNode->AppendChild("NumStagesPassedByGrade"); - FOREACH_Grade( g ) + FOREACH_ENUM( Grade, g ) { if( !m_iNumStagesPassedByGrade[g] ) continue; @@ -1263,7 +1263,7 @@ void Profile::LoadGeneralDataFromNode( const XNode* pNode ) { const XNode* pNumSongsPlayedByPlayMode = pNode->GetChild("NumSongsPlayedByPlayMode"); if( pNumSongsPlayedByPlayMode ) - FOREACH_PlayMode( pm ) + FOREACH_ENUM( PlayMode, pm ) pNumSongsPlayedByPlayMode->GetChildValue( PlayModeToString(pm), m_iNumSongsPlayedByPlayMode[pm] ); } @@ -1290,7 +1290,7 @@ void Profile::LoadGeneralDataFromNode( const XNode* pNode ) { const XNode* pNumSongsPlayedByDifficulty = pNode->GetChild("NumSongsPlayedByDifficulty"); if( pNumSongsPlayedByDifficulty ) - FOREACH_Difficulty( dc ) + FOREACH_ENUM( Difficulty, dc ) pNumSongsPlayedByDifficulty->GetChildValue( DifficultyToString(dc), m_iNumSongsPlayedByDifficulty[dc] ); } @@ -1306,14 +1306,14 @@ void Profile::LoadGeneralDataFromNode( const XNode* pNode ) { const XNode* pNumStagesPassedByGrade = pNode->GetChild("NumStagesPassedByGrade"); if( pNumStagesPassedByGrade ) - FOREACH_Grade( g ) + FOREACH_ENUM( Grade, g ) pNumStagesPassedByGrade->GetChildValue( GradeToString(g), m_iNumStagesPassedByGrade[g] ); } { const XNode* pNumStagesPassedByPlayMode = pNode->GetChild("NumStagesPassedByPlayMode"); if( pNumStagesPassedByPlayMode ) - FOREACH_PlayMode( pm ) + FOREACH_ENUM( PlayMode, pm ) pNumStagesPassedByPlayMode->GetChildValue( PlayModeToString(pm), m_iNumStagesPassedByPlayMode[pm] ); } @@ -1533,7 +1533,7 @@ XNode* Profile::SaveCategoryScoresCreateNode() const XNode* pNode = new XNode( "CategoryScores" ); - FOREACH_StepsType( st ) + FOREACH_ENUM( StepsType,st ) { // skip steps types that have never been played if( pProfile->GetCategoryNumTimesPlayed( st ) == 0 ) @@ -1542,7 +1542,7 @@ XNode* Profile::SaveCategoryScoresCreateNode() const XNode* pStepsTypeNode = pNode->AppendChild( "StepsType" ); pStepsTypeNode->AppendAttr( "Type", GameManager::StepsTypeToString(st) ); - FOREACH_RankingCategory( rc ) + FOREACH_ENUM( RankingCategory,rc ) { // skip steps types/categories that have never been played if( pProfile->GetCategoryHighScoreList(st,rc).GetNumTimesPlayed() == 0 ) diff --git a/stepmania/src/RadarValues.cpp b/stepmania/src/RadarValues.cpp index aa6a955101..f35da1808b 100644 --- a/stepmania/src/RadarValues.cpp +++ b/stepmania/src/RadarValues.cpp @@ -12,13 +12,13 @@ RadarValues::RadarValues() void RadarValues::MakeUnknown() { - FOREACH_RadarCategory( rc ) + FOREACH_ENUM( RadarCategory, rc ) m_Values.f[rc] = RADAR_VAL_UNKNOWN; } void RadarValues::Zero() { - FOREACH_RadarCategory( rc ) + FOREACH_ENUM( RadarCategory, rc ) m_Values.f[rc] = 0; } @@ -27,7 +27,7 @@ XNode* RadarValues::CreateNode( bool bIncludeSimpleValues, bool bIncludeComplexV XNode* pNode = new XNode( "RadarValues" ); // TRICKY: Don't print a remainder for the integer values. - FOREACH_RadarCategory( rc ) + FOREACH_ENUM( RadarCategory, rc ) { if( rc >= RadarCategory_TapsAndHolds ) { @@ -50,7 +50,7 @@ void RadarValues::LoadFromNode( const XNode* pNode ) Zero(); - FOREACH_RadarCategory( rc ) + FOREACH_ENUM( RadarCategory, rc ) pNode->GetChildValue( RadarCategoryToString(rc), m_Values.f[rc] ); } @@ -80,7 +80,7 @@ void RadarValues::FromString( RString sRadarValues ) return; } - FOREACH_RadarCategory(rc) + FOREACH_ENUM( RadarCategory, rc ) m_Values.f[rc] = StringToFloat( saValues[rc] ); } diff --git a/stepmania/src/RadarValues.h b/stepmania/src/RadarValues.h index fafbb867b9..a666cd4a9a 100644 --- a/stepmania/src/RadarValues.h +++ b/stepmania/src/RadarValues.h @@ -41,13 +41,13 @@ struct RadarValues RadarValues& operator+=( const RadarValues& other ) { - FOREACH_RadarCategory( rc ) + FOREACH_ENUM( RadarCategory, rc ) m_Values.f[rc] += other.m_Values.f[rc]; return *this; } bool operator==( const RadarValues& other ) const { - FOREACH_RadarCategory( rc ) + FOREACH_ENUM( RadarCategory, rc ) { if( m_Values.f[rc] != other.m_Values.f[rc] ) return false; diff --git a/stepmania/src/ScoreDisplayLifeTime.cpp b/stepmania/src/ScoreDisplayLifeTime.cpp index ca25e75e54..0c83a00291 100644 --- a/stepmania/src/ScoreDisplayLifeTime.cpp +++ b/stepmania/src/ScoreDisplayLifeTime.cpp @@ -39,13 +39,13 @@ void ScoreDisplayLifeTime::Init( const PlayerState* pPlayerState, const PlayerSt this->AddChild( &m_textDeltaSeconds ); ActorUtil::LoadAllCommandsAndOnCommand( m_textDeltaSeconds, sType ); - FOREACH_TapNoteScore( tns ) + FOREACH_ENUM( TapNoteScore, tns ) { const RString &sCommand = TapNoteScoreToString(tns); if( !m_textDeltaSeconds.HasCommand( sCommand ) ) ActorUtil::LoadCommand( m_textDeltaSeconds, sType, sCommand ); } - FOREACH_HoldNoteScore( hns ) + FOREACH_ENUM( HoldNoteScore, hns ) { const RString &sCommand = HoldNoteScoreToString(hns); if( !m_textDeltaSeconds.HasCommand( sCommand ) ) diff --git a/stepmania/src/ScreenDebugOverlay.cpp b/stepmania/src/ScreenDebugOverlay.cpp index ebdbf48f4d..4b48f9661e 100644 --- a/stepmania/src/ScreenDebugOverlay.cpp +++ b/stepmania/src/ScreenDebugOverlay.cpp @@ -675,12 +675,12 @@ static HighScore MakeRandomHighScore( float fPercentDP ) hs.SetPlayerGuid( Profile::MakeGuid() ); hs.SetMachineGuid( Profile::MakeGuid() ); hs.SetProductID( RandomInt(10) ); - FOREACH_TapNoteScore( tns ) + FOREACH_ENUM( TapNoteScore, tns ) hs.SetTapNoteScore( tns, RandomInt(100) ); - FOREACH_HoldNoteScore( hns ) + FOREACH_ENUM( HoldNoteScore, hns ) hs.SetHoldNoteScore( hns, RandomInt(100) ); RadarValues rv; - FOREACH_RadarCategory( rc ) + FOREACH_ENUM( RadarCategory, rc ) rv.m_Values.f[rc] = randomf( 0, 1 ); hs.SetRadarValues( rv ); diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp index 5b76edf8c1..b122373de8 100644 --- a/stepmania/src/ScreenEdit.cpp +++ b/stepmania/src/ScreenEdit.cpp @@ -2765,7 +2765,7 @@ void ScreenEdit::HandleMainMenuChoice( MainMenuChoice c, const vector &iAns float fMusicSeconds = m_soundMusic.GetLengthSeconds(); g_StepsInformation.rows[difficulty].choices.clear(); - FOREACH_Difficulty( dc ) + FOREACH_ENUM( Difficulty, dc ) g_StepsInformation.rows[difficulty].choices.push_back( "|" + DifficultyToLocalizedString(pSteps->GetDifficulty()) ); g_StepsInformation.rows[difficulty].iDefaultChoice = pSteps->GetDifficulty(); g_StepsInformation.rows[difficulty].bEnabled = (EDIT_MODE.GetValue() >= EditMode_Full); diff --git a/stepmania/src/ScreenJukebox.cpp b/stepmania/src/ScreenJukebox.cpp index 43dabb14bc..8167db9293 100644 --- a/stepmania/src/ScreenJukebox.cpp +++ b/stepmania/src/ScreenJukebox.cpp @@ -63,7 +63,7 @@ void ScreenJukebox::SetSong() } else { - FOREACH_Difficulty( dc ) + FOREACH_ENUM( Difficulty, dc ) vDifficultiesToShow.push_back( dc ); } } diff --git a/stepmania/src/Song.cpp b/stepmania/src/Song.cpp index 5e9f1ddee0..7a1f9f00d6 100644 --- a/stepmania/src/Song.cpp +++ b/stepmania/src/Song.cpp @@ -77,7 +77,7 @@ Song::~Song() void Song::DetachSteps() { m_vpSteps.clear(); - FOREACH_StepsType( st ) + FOREACH_ENUM( StepsType, st ) m_vpStepsByType[st].clear(); } @@ -87,7 +87,7 @@ void Song::Reset() FOREACH( Steps*, m_vpSteps, s ) SAFE_DELETE( *s ); m_vpSteps.clear(); - FOREACH_StepsType( st ) + FOREACH_ENUM( StepsType, st ) m_vpStepsByType[st].clear(); Song empty; @@ -288,7 +288,7 @@ bool Song::ReloadFromSongDir( RString sDir ) // Now we wipe out the new pointers, which were shallow copied and not deep copied... m_vpSteps.clear(); - FOREACH_StepsType( i ) + FOREACH_ENUM( StepsType, i ) m_vpStepsByType[i].clear(); // Then we copy as many Steps as possible on top of the old pointers. @@ -889,7 +889,7 @@ void Song::AddAutoGenNotes() HasNotes[st] = true; } - FOREACH_StepsType( stMissing ) + FOREACH_ENUM( StepsType, stMissing ) { if( HasNotes[stMissing] ) continue; @@ -907,7 +907,7 @@ void Song::AddAutoGenNotes() StepsType stBestMatch = StepsType_Invalid; int iBestTrackDifference = INT_MAX; - FOREACH_StepsType( st ) + FOREACH_ENUM( StepsType, st ) { if( !HasNotes[st] ) continue; @@ -945,7 +945,7 @@ void Song::AutoGen( StepsType ntTo, StepsType ntFrom ) void Song::RemoveAutoGenNotes() { - FOREACH_StepsType(st) + FOREACH_ENUM( StepsType, st ) { for( int j=m_vpStepsByType[st].size()-1; j>=0; j-- ) { diff --git a/stepmania/src/SongManager.cpp b/stepmania/src/SongManager.cpp index 2871cb7663..6467ec1fe7 100644 --- a/stepmania/src/SongManager.cpp +++ b/stepmania/src/SongManager.cpp @@ -1300,13 +1300,13 @@ void SongManager::UpdatePopular() SongUtil::SortSongPointerArrayByTitle( apBestSongs ); vector apBestCourses[NUM_CourseType]; - FOREACH_CourseType( ct ) + FOREACH_ENUM( CourseType, ct ) { GetCourses( ct, apBestCourses[ct], PREFSMAN->m_bAutogenGroupCourses ); CourseUtil::SortCoursePointerArrayByTitle( apBestCourses[ct] ); } - FOREACH_ProfileSlot( i ) + FOREACH_ENUM( ProfileSlot, i ) { m_pPopularSongs[i] = apBestSongs; diff --git a/stepmania/src/SongUtil.cpp b/stepmania/src/SongUtil.cpp index 5827d5b5ec..57065ebfe8 100644 --- a/stepmania/src/SongUtil.cpp +++ b/stepmania/src/SongUtil.cpp @@ -228,9 +228,9 @@ Steps* SongUtil::GetClosestNotes( const Song *pSong, StepsType st, Difficulty dc * on this; see BMSLoader::SlideDuplicateDifficulties.) */ void SongUtil::AdjustDuplicateSteps( Song *pSong ) { - FOREACH_StepsType( st ) + FOREACH_ENUM( StepsType, st ) { - FOREACH_Difficulty( dc ) + FOREACH_ENUM( Difficulty, dc ) { if( dc == Difficulty_Edit ) continue; diff --git a/stepmania/src/StageStats.cpp b/stepmania/src/StageStats.cpp index a786d6cc58..d6d4f3c5ed 100644 --- a/stepmania/src/StageStats.cpp +++ b/stepmania/src/StageStats.cpp @@ -170,9 +170,9 @@ void StageStats::CommitScores( bool bSummary ) hs.SetPlayerGuid( PROFILEMAN->IsPersistentProfile(p) ? PROFILEMAN->GetProfile(p)->m_sGuid : RString("") ); hs.SetMachineGuid( PROFILEMAN->GetMachineProfile()->m_sGuid ); hs.SetProductID( PREFSMAN->m_iProductID ); - FOREACH_TapNoteScore( tns ) + FOREACH_ENUM( TapNoteScore, tns ) hs.SetTapNoteScore( tns, m_player[p].m_iTapNoteScores[tns] ); - FOREACH_HoldNoteScore( hns ) + FOREACH_ENUM( HoldNoteScore, hns ) hs.SetHoldNoteScore( hns, m_player[p].m_iHoldNoteScores[hns] ); hs.SetRadarValues( m_player[p].m_radarActual ); hs.SetLifeRemainingSeconds( m_player[p].m_fLifeRemainingSeconds ); diff --git a/stepmania/src/UnlockManager.cpp b/stepmania/src/UnlockManager.cpp index 22ce72207b..a30f5063ec 100644 --- a/stepmania/src/UnlockManager.cpp +++ b/stepmania/src/UnlockManager.cpp @@ -208,7 +208,7 @@ static float GetArcadePoints( const Profile *pProfile ) { float fAP = 0; - FOREACH_Grade(g) + FOREACH_ENUM( Grade, g ) { switch(g) { @@ -223,7 +223,7 @@ static float GetArcadePoints( const Profile *pProfile ) } } - FOREACH_PlayMode(pm) + FOREACH_ENUM( PlayMode, pm ) { switch(pm) { @@ -243,7 +243,7 @@ static float GetSongPoints( const Profile *pProfile ) { float fSP = 0; - FOREACH_Grade(g) + FOREACH_ENUM( Grade, g ) { switch( g ) { @@ -261,7 +261,7 @@ static float GetSongPoints( const Profile *pProfile ) } } - FOREACH_PlayMode(pm) + FOREACH_ENUM( PlayMode, pm ) { switch(pm) {