From 8cac261c52dc23e2b53de718f2a8394a9824fd2d Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Thu, 31 Mar 2005 06:14:28 +0000 Subject: [PATCH] clean up GRADE_ constant names to match GradeToString --- stepmania/src/GameCommand.cpp | 2 +- stepmania/src/GameState.cpp | 2 +- stepmania/src/Grade.cpp | 30 ++++++++------- stepmania/src/Grade.h | 40 ++++++++++---------- stepmania/src/GradeDisplay.cpp | 14 +++---- stepmania/src/HighScore.cpp | 2 +- stepmania/src/ScreenEvaluation.cpp | 6 +-- stepmania/src/ScreenNameEntryTraditional.cpp | 2 +- stepmania/src/ScreenNetEvaluation.cpp | 2 +- stepmania/src/SongUtil.cpp | 4 +- stepmania/src/StatsManager.cpp | 2 +- stepmania/src/UnlockManager.cpp | 18 ++++----- 12 files changed, 63 insertions(+), 61 deletions(-) diff --git a/stepmania/src/GameCommand.cpp b/stepmania/src/GameCommand.cpp index e8bb186c89..1b94773add 100644 --- a/stepmania/src/GameCommand.cpp +++ b/stepmania/src/GameCommand.cpp @@ -587,7 +587,7 @@ static HighScore MakeRandomHighScore() { HighScore hs; hs.sName = "FAKE"; - hs.grade = (Grade)SCALE( rand()%5, 0, 4, GRADE_TIER_01, GRADE_TIER_05 ); + hs.grade = (Grade)SCALE( rand()%5, 0, 4, GRADE_TIER01, GRADE_TIER05 ); hs.iScore = rand()%100*1000; hs.fPercentDP = randomf( 0.5f, 1.0f ); hs.fSurviveSeconds = randomf( 30.0f, 100.0f ); diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp index e361b9c4d2..27789cb344 100644 --- a/stepmania/src/GameState.cpp +++ b/stepmania/src/GameState.cpp @@ -951,7 +951,7 @@ bool GameState::HasEarnedExtraStage() const if( PREFSMAN->m_bPickExtraStage && this->IsExtraStage() && !this->m_bAllow2ndExtraStage ) continue; - if( STATSMAN->m_CurStageStats.m_player[pn].GetGrade() <= GRADE_TIER_03 ) + if( STATSMAN->m_CurStageStats.m_player[pn].GetGrade() <= GRADE_TIER03 ) return true; } } diff --git a/stepmania/src/Grade.cpp b/stepmania/src/Grade.cpp index fff6f3351b..bd17e76139 100644 --- a/stepmania/src/Grade.cpp +++ b/stepmania/src/Grade.cpp @@ -6,6 +6,8 @@ #include "EnumHelper.h" #include "LuaManager.h" +LuaFunction_Int( GradeToString, GradeToString((Grade)a1) ) + CString GradeToThemedString( Grade g ) { CString s = GradeToString(g); @@ -19,13 +21,13 @@ CString GradeToOldString( Grade g ) // string is meant to be human readable switch( g ) { - case GRADE_TIER_01: return "AAAA"; - case GRADE_TIER_02: return "AAA"; - case GRADE_TIER_03: return "AA"; - case GRADE_TIER_04: return "A"; - case GRADE_TIER_05: return "B"; - case GRADE_TIER_06: return "C"; - case GRADE_TIER_07: return "D"; + case GRADE_TIER01: return "AAAA"; + case GRADE_TIER02: return "AAA"; + case GRADE_TIER03: return "AA"; + case GRADE_TIER04: return "A"; + case GRADE_TIER05: return "B"; + case GRADE_TIER06: return "C"; + case GRADE_TIER07: return "D"; case GRADE_FAILED: return "E"; case GRADE_NO_DATA: return "N"; default: return "N"; @@ -38,13 +40,13 @@ Grade StringToGrade( const CString &sGrade ) s.MakeUpper(); // for backward compatibility - if ( s == "AAAA" ) return GRADE_TIER_01; - else if( s == "AAA" ) return GRADE_TIER_02; - else if( s == "AA" ) return GRADE_TIER_03; - else if( s == "A" ) return GRADE_TIER_04; - else if( s == "B" ) return GRADE_TIER_05; - else if( s == "C" ) return GRADE_TIER_06; - else if( s == "D" ) return GRADE_TIER_07; + if ( s == "AAAA" ) return GRADE_TIER01; + else if( s == "AAA" ) return GRADE_TIER02; + else if( s == "AA" ) return GRADE_TIER03; + else if( s == "A" ) return GRADE_TIER04; + else if( s == "B" ) return GRADE_TIER05; + else if( s == "C" ) return GRADE_TIER06; + else if( s == "D" ) return GRADE_TIER07; else if( s == "E" ) return GRADE_FAILED; else if( s == "N" ) return GRADE_NO_DATA; diff --git a/stepmania/src/Grade.h b/stepmania/src/Grade.h index 3a7f9cc963..787eee7092 100644 --- a/stepmania/src/Grade.h +++ b/stepmania/src/Grade.h @@ -8,26 +8,26 @@ #define NUM_GRADE_TIERS 20 enum Grade { - GRADE_TIER_01, // = AAAA - GRADE_TIER_02, // = AAA - GRADE_TIER_03, // = AA - GRADE_TIER_04, // = A - GRADE_TIER_05, // = B - GRADE_TIER_06, // = C - GRADE_TIER_07, // = D - GRADE_TIER_08, - GRADE_TIER_09, - GRADE_TIER_10, - GRADE_TIER_11, - GRADE_TIER_12, - GRADE_TIER_13, - GRADE_TIER_14, - GRADE_TIER_15, - GRADE_TIER_16, - GRADE_TIER_17, - GRADE_TIER_18, - GRADE_TIER_19, - GRADE_TIER_20, + GRADE_TIER01, // = AAAA + GRADE_TIER02, // = AAA + GRADE_TIER03, // = AA + GRADE_TIER04, // = A + GRADE_TIER05, // = B + GRADE_TIER06, // = C + GRADE_TIER07, // = D + GRADE_TIER08, + GRADE_TIER09, + GRADE_TIER10, + GRADE_TIER11, + GRADE_TIER12, + GRADE_TIER13, + GRADE_TIER14, + GRADE_TIER15, + GRADE_TIER16, + GRADE_TIER17, + GRADE_TIER18, + GRADE_TIER19, + GRADE_TIER20, GRADE_FAILED, // = E NUM_GRADES, GRADE_NO_DATA, // ~GRADE_INVALID diff --git a/stepmania/src/GradeDisplay.cpp b/stepmania/src/GradeDisplay.cpp index b04302bcda..239c08e755 100644 --- a/stepmania/src/GradeDisplay.cpp +++ b/stepmania/src/GradeDisplay.cpp @@ -97,13 +97,13 @@ int GradeDisplay::GetFrameIndex( PlayerNumber pn, Grade g ) int iFrame; switch( g ) { - case GRADE_TIER_01: iFrame = 0; break; - case GRADE_TIER_02: iFrame = 1; break; - case GRADE_TIER_03: iFrame = 2; break; - case GRADE_TIER_04: iFrame = 3; break; - case GRADE_TIER_05: iFrame = 4; break; - case GRADE_TIER_06: iFrame = 5; break; - case GRADE_TIER_07: iFrame = 6; break; + case GRADE_TIER01: iFrame = 0; break; + case GRADE_TIER02: iFrame = 1; break; + case GRADE_TIER03: iFrame = 2; break; + case GRADE_TIER04: iFrame = 3; break; + case GRADE_TIER05: iFrame = 4; break; + case GRADE_TIER06: iFrame = 5; break; + case GRADE_TIER07: iFrame = 6; break; case GRADE_FAILED: iFrame = 7; break; default: iFrame = 7; break; } diff --git a/stepmania/src/HighScore.cpp b/stepmania/src/HighScore.cpp index 669af35a71..323fbc2c54 100644 --- a/stepmania/src/HighScore.cpp +++ b/stepmania/src/HighScore.cpp @@ -96,7 +96,7 @@ void HighScore::LoadFromNode( const XNode* pNode ) radarValues.LoadFromNode( pRadarValues ); /* Validate input. */ - grade = clamp( grade, GRADE_TIER_01, GRADE_FAILED ); + grade = clamp( grade, GRADE_TIER01, GRADE_FAILED ); } CString HighScore::GetDisplayName() const diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index cffad62063..55affa9b38 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -847,9 +847,9 @@ void ScreenEvaluation::Init() switch( best_grade ) { - case GRADE_TIER_01: - case GRADE_TIER_02: - case GRADE_TIER_03: + case GRADE_TIER01: + case GRADE_TIER02: + case GRADE_TIER03: this->PostScreenMessage( SM_PlayCheer, CHEER_DELAY_SECONDS ); break; } diff --git a/stepmania/src/ScreenNameEntryTraditional.cpp b/stepmania/src/ScreenNameEntryTraditional.cpp index f701bb7737..ab9f2c1850 100644 --- a/stepmania/src/ScreenNameEntryTraditional.cpp +++ b/stepmania/src/ScreenNameEntryTraditional.cpp @@ -152,7 +152,7 @@ ScreenNameEntryTraditional::ScreenNameEntryTraditional( CString sClassName ) : S ss.m_player[p].iActualDancePoints = 985; HighScore hs; - hs.grade = GRADE_TIER_03; + hs.grade = GRADE_TIER03; hs.fPercentDP = ss.m_player[p].GetPercentDancePoints(); hs.iScore = ss.m_player[p].iScore; StepsType st = GAMESTATE->GetCurrentStyle()->m_StepsType; diff --git a/stepmania/src/ScreenNetEvaluation.cpp b/stepmania/src/ScreenNetEvaluation.cpp index fe8dff2893..38fd8fef66 100644 --- a/stepmania/src/ScreenNetEvaluation.cpp +++ b/stepmania/src/ScreenNetEvaluation.cpp @@ -158,7 +158,7 @@ void ScreenNetEvaluation::HandleScreenMessage( const ScreenMessage SM ) break; m_textUsers[i].SetText( NSMAN->m_PlayerNames[NSMAN->m_EvalPlayerData[i].name] ); - if ( NSMAN->m_EvalPlayerData[i].grade < GRADE_TIER_03 ) //Yes, hardcoded (I'd like to leave it that way) + if ( NSMAN->m_EvalPlayerData[i].grade < GRADE_TIER03 ) //Yes, hardcoded (I'd like to leave it that way) m_textUsers[i].TurnRainbowOn(); else m_textUsers[i].TurnRainbowOff(); diff --git a/stepmania/src/SongUtil.cpp b/stepmania/src/SongUtil.cpp index dae475e87d..bd2d7a3589 100644 --- a/stepmania/src/SongUtil.cpp +++ b/stepmania/src/SongUtil.cpp @@ -123,7 +123,7 @@ void SongUtil::SortSongPointerArrayByGrade( vector &arraySongPointers ) CString foo; foo.reserve(256); - for( int g=GRADE_TIER_01; g<=GRADE_NO_DATA; ++g ) + for( int g=GRADE_TIER01; g<=GRADE_NO_DATA; ++g ) AppendOctal( iCounts[g], 3, foo ); vals.push_back( val(pSong, foo) ); } @@ -261,7 +261,7 @@ CString SongUtil::GetSectionNameFromSongAndSort( const Song* pSong, SortOrder so int iCounts[NUM_GRADES]; PROFILEMAN->GetMachineProfile()->GetGrades( pSong, GAMESTATE->GetCurrentStyle()->m_StepsType, iCounts ); - for( int i=GRADE_TIER_01; i 0 ) diff --git a/stepmania/src/StatsManager.cpp b/stepmania/src/StatsManager.cpp index 748fc37850..a845d4bc21 100644 --- a/stepmania/src/StatsManager.cpp +++ b/stepmania/src/StatsManager.cpp @@ -218,7 +218,7 @@ static Grade GetBestGrade() static Grade GetWorstGrade() { - Grade g = GRADE_TIER_01; + Grade g = GRADE_TIER01; FOREACH_EnabledPlayer( pn ) g = max( g, STATSMAN->m_CurStageStats.m_player[pn].GetGrade() ); return g; diff --git a/stepmania/src/UnlockManager.cpp b/stepmania/src/UnlockManager.cpp index e4b004fcaf..9644ace101 100644 --- a/stepmania/src/UnlockManager.cpp +++ b/stepmania/src/UnlockManager.cpp @@ -152,8 +152,8 @@ static float GetArcadePoints( const Profile *pProfile ) { switch(g) { - case GRADE_TIER_01: - case GRADE_TIER_02: fAP += 9 * pProfile->m_iNumStagesPassedByGrade[g]; break; + case GRADE_TIER01: + case GRADE_TIER02: fAP += 9 * pProfile->m_iNumStagesPassedByGrade[g]; break; default: fAP += 1 * pProfile->m_iNumStagesPassedByGrade[g]; break; case GRADE_FAILED: @@ -187,13 +187,13 @@ static float GetSongPoints( const Profile *pProfile ) { switch( g ) { - case GRADE_TIER_01:/*AAAA*/ fSP += 20 * pProfile->m_iNumStagesPassedByGrade[g]; break; - case GRADE_TIER_02:/*AAA*/ fSP += 10* pProfile->m_iNumStagesPassedByGrade[g]; break; - case GRADE_TIER_03:/*AA*/ fSP += 5* pProfile->m_iNumStagesPassedByGrade[g]; break; - case GRADE_TIER_04:/*A*/ fSP += 4* pProfile->m_iNumStagesPassedByGrade[g]; break; - case GRADE_TIER_05:/*B*/ fSP += 3* pProfile->m_iNumStagesPassedByGrade[g]; break; - case GRADE_TIER_06:/*C*/ fSP += 2* pProfile->m_iNumStagesPassedByGrade[g]; break; - case GRADE_TIER_07:/*D*/ fSP += 1* pProfile->m_iNumStagesPassedByGrade[g]; break; + case GRADE_TIER01:/*AAAA*/ fSP += 20 * pProfile->m_iNumStagesPassedByGrade[g]; break; + case GRADE_TIER02:/*AAA*/ fSP += 10* pProfile->m_iNumStagesPassedByGrade[g]; break; + case GRADE_TIER03:/*AA*/ fSP += 5* pProfile->m_iNumStagesPassedByGrade[g]; break; + case GRADE_TIER04:/*A*/ fSP += 4* pProfile->m_iNumStagesPassedByGrade[g]; break; + case GRADE_TIER05:/*B*/ fSP += 3* pProfile->m_iNumStagesPassedByGrade[g]; break; + case GRADE_TIER06:/*C*/ fSP += 2* pProfile->m_iNumStagesPassedByGrade[g]; break; + case GRADE_TIER07:/*D*/ fSP += 1* pProfile->m_iNumStagesPassedByGrade[g]; break; case GRADE_FAILED: case GRADE_NO_DATA: ; // no points