actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

clean up GRADE_ constant names to match GradeToString

Browse Source
This commit is contained in:
Chris Danford
2005-03-31 06:14:28 +00:00
parent d39fa29164
commit 8cac261c52
12 changed files with 63 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameCommand.cpp
+1 -1
View File
@@ -587,7 +587,7 @@ static HighScore MakeRandomHighScore()
{ {
HighScore hs; HighScore hs;
hs.sName = "FAKE"; 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.iScore = rand()%100*1000;
hs.fPercentDP = randomf( 0.5f, 1.0f ); hs.fPercentDP = randomf( 0.5f, 1.0f );
hs.fSurviveSeconds = randomf( 30.0f, 100.0f ); hs.fSurviveSeconds = randomf( 30.0f, 100.0f );
stepmania/src/GameState.cpp
+1 -1
View File
@@ -951,7 +951,7 @@ bool GameState::HasEarnedExtraStage() const
if( PREFSMAN->m_bPickExtraStage && this->IsExtraStage() && !this->m_bAllow2ndExtraStage ) if( PREFSMAN->m_bPickExtraStage && this->IsExtraStage() && !this->m_bAllow2ndExtraStage )
continue; continue;
if( STATSMAN->m_CurStageStats.m_player[pn].GetGrade() <= GRADE_TIER_03 ) if( STATSMAN->m_CurStageStats.m_player[pn].GetGrade() <= GRADE_TIER03 )
return true; return true;
} }
} }
stepmania/src/Grade.cpp
+16 -14
View File
@@ -6,6 +6,8 @@
#include "EnumHelper.h" #include "EnumHelper.h"
#include "LuaManager.h" #include "LuaManager.h"
LuaFunction_Int( GradeToString, GradeToString((Grade)a1) )
CString GradeToThemedString( Grade g ) CString GradeToThemedString( Grade g )
{ {
CString s = GradeToString(g); CString s = GradeToString(g);
@@ -19,13 +21,13 @@ CString GradeToOldString( Grade g )
// string is meant to be human readable // string is meant to be human readable
switch( g ) switch( g )
{ {
case GRADE_TIER_01: return "AAAA"; case GRADE_TIER01: return "AAAA";
case GRADE_TIER_02: return "AAA"; case GRADE_TIER02: return "AAA";
case GRADE_TIER_03: return "AA"; case GRADE_TIER03: return "AA";
case GRADE_TIER_04: return "A"; case GRADE_TIER04: return "A";
case GRADE_TIER_05: return "B"; case GRADE_TIER05: return "B";
case GRADE_TIER_06: return "C"; case GRADE_TIER06: return "C";
case GRADE_TIER_07: return "D"; case GRADE_TIER07: return "D";
case GRADE_FAILED: return "E"; case GRADE_FAILED: return "E";
case GRADE_NO_DATA: return "N"; case GRADE_NO_DATA: return "N";
default: return "N"; default: return "N";
@@ -38,13 +40,13 @@ Grade StringToGrade( const CString &sGrade )
s.MakeUpper(); s.MakeUpper();
// for backward compatibility // for backward compatibility
if ( s == "AAAA" ) return GRADE_TIER_01; if ( s == "AAAA" ) return GRADE_TIER01;
else if( s == "AAA" ) return GRADE_TIER_02; else if( s == "AAA" ) return GRADE_TIER02;
else if( s == "AA" ) return GRADE_TIER_03; else if( s == "AA" ) return GRADE_TIER03;
else if( s == "A" ) return GRADE_TIER_04; else if( s == "A" ) return GRADE_TIER04;
else if( s == "B" ) return GRADE_TIER_05; else if( s == "B" ) return GRADE_TIER05;
else if( s == "C" ) return GRADE_TIER_06; else if( s == "C" ) return GRADE_TIER06;
else if( s == "D" ) return GRADE_TIER_07; else if( s == "D" ) return GRADE_TIER07;
else if( s == "E" ) return GRADE_FAILED; else if( s == "E" ) return GRADE_FAILED;
else if( s == "N" ) return GRADE_NO_DATA; else if( s == "N" ) return GRADE_NO_DATA;
stepmania/src/Grade.h
+20 -20
View File
@@ -8,26 +8,26 @@
#define NUM_GRADE_TIERS 20 #define NUM_GRADE_TIERS 20
enum Grade enum Grade
{ {
GRADE_TIER_01, // = AAAA GRADE_TIER01, // = AAAA
GRADE_TIER_02, // = AAA GRADE_TIER02, // = AAA
GRADE_TIER_03, // = AA GRADE_TIER03, // = AA
GRADE_TIER_04, // = A GRADE_TIER04, // = A
GRADE_TIER_05, // = B GRADE_TIER05, // = B
GRADE_TIER_06, // = C GRADE_TIER06, // = C
GRADE_TIER_07, // = D GRADE_TIER07, // = D
GRADE_TIER_08, GRADE_TIER08,
GRADE_TIER_09, GRADE_TIER09,
GRADE_TIER_10, GRADE_TIER10,
GRADE_TIER_11, GRADE_TIER11,
GRADE_TIER_12, GRADE_TIER12,
GRADE_TIER_13, GRADE_TIER13,
GRADE_TIER_14, GRADE_TIER14,
GRADE_TIER_15, GRADE_TIER15,
GRADE_TIER_16, GRADE_TIER16,
GRADE_TIER_17, GRADE_TIER17,
GRADE_TIER_18, GRADE_TIER18,
GRADE_TIER_19, GRADE_TIER19,
GRADE_TIER_20, GRADE_TIER20,
GRADE_FAILED, // = E GRADE_FAILED, // = E
NUM_GRADES, NUM_GRADES,
GRADE_NO_DATA, // ~GRADE_INVALID GRADE_NO_DATA, // ~GRADE_INVALID
stepmania/src/GradeDisplay.cpp
+7 -7
View File
@@ -97,13 +97,13 @@ int GradeDisplay::GetFrameIndex( PlayerNumber pn, Grade g )
int iFrame; int iFrame;
switch( g ) switch( g )
{ {
case GRADE_TIER_01: iFrame = 0; break; case GRADE_TIER01: iFrame = 0; break;
case GRADE_TIER_02: iFrame = 1; break; case GRADE_TIER02: iFrame = 1; break;
case GRADE_TIER_03: iFrame = 2; break; case GRADE_TIER03: iFrame = 2; break;
case GRADE_TIER_04: iFrame = 3; break; case GRADE_TIER04: iFrame = 3; break;
case GRADE_TIER_05: iFrame = 4; break; case GRADE_TIER05: iFrame = 4; break;
case GRADE_TIER_06: iFrame = 5; break; case GRADE_TIER06: iFrame = 5; break;
case GRADE_TIER_07: iFrame = 6; break; case GRADE_TIER07: iFrame = 6; break;
case GRADE_FAILED: iFrame = 7; break; case GRADE_FAILED: iFrame = 7; break;
default: iFrame = 7; break; default: iFrame = 7; break;
} }
stepmania/src/HighScore.cpp
+1 -1
View File
@@ -96,7 +96,7 @@ void HighScore::LoadFromNode( const XNode* pNode )
radarValues.LoadFromNode( pRadarValues ); radarValues.LoadFromNode( pRadarValues );
/* Validate input. */ /* Validate input. */
grade = clamp( grade, GRADE_TIER_01, GRADE_FAILED ); grade = clamp( grade, GRADE_TIER01, GRADE_FAILED );
} }
CString HighScore::GetDisplayName() const CString HighScore::GetDisplayName() const
stepmania/src/ScreenEvaluation.cpp
+3 -3
View File
@@ -847,9 +847,9 @@ void ScreenEvaluation::Init()
switch( best_grade ) switch( best_grade )
{ {
case GRADE_TIER_01: case GRADE_TIER01:
case GRADE_TIER_02: case GRADE_TIER02:
case GRADE_TIER_03: case GRADE_TIER03:
this->PostScreenMessage( SM_PlayCheer, CHEER_DELAY_SECONDS ); this->PostScreenMessage( SM_PlayCheer, CHEER_DELAY_SECONDS );
break; break;
} }
stepmania/src/ScreenNameEntryTraditional.cpp
+1 -1
View File
@@ -152,7 +152,7 @@ ScreenNameEntryTraditional::ScreenNameEntryTraditional( CString sClassName ) : S
ss.m_player[p].iActualDancePoints = 985; ss.m_player[p].iActualDancePoints = 985;
HighScore hs; HighScore hs;
hs.grade = GRADE_TIER_03; hs.grade = GRADE_TIER03;
hs.fPercentDP = ss.m_player[p].GetPercentDancePoints(); hs.fPercentDP = ss.m_player[p].GetPercentDancePoints();
hs.iScore = ss.m_player[p].iScore; hs.iScore = ss.m_player[p].iScore;
StepsType st = GAMESTATE->GetCurrentStyle()->m_StepsType; StepsType st = GAMESTATE->GetCurrentStyle()->m_StepsType;
stepmania/src/ScreenNetEvaluation.cpp
+1 -1
View File
@@ -158,7 +158,7 @@ void ScreenNetEvaluation::HandleScreenMessage( const ScreenMessage SM )
break; break;
m_textUsers[i].SetText( NSMAN->m_PlayerNames[NSMAN->m_EvalPlayerData[i].name] ); 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(); m_textUsers[i].TurnRainbowOn();
else else
m_textUsers[i].TurnRainbowOff(); m_textUsers[i].TurnRainbowOff();
stepmania/src/SongUtil.cpp
+2 -2
View File
@@ -123,7 +123,7 @@ void SongUtil::SortSongPointerArrayByGrade( vector<Song*> &arraySongPointers )
CString foo; CString foo;
foo.reserve(256); 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 ); AppendOctal( iCounts[g], 3, foo );
vals.push_back( val(pSong, foo) ); vals.push_back( val(pSong, foo) );
} }
@@ -261,7 +261,7 @@ CString SongUtil::GetSectionNameFromSongAndSort( const Song* pSong, SortOrder so
int iCounts[NUM_GRADES]; int iCounts[NUM_GRADES];
PROFILEMAN->GetMachineProfile()->GetGrades( pSong, GAMESTATE->GetCurrentStyle()->m_StepsType, iCounts ); PROFILEMAN->GetMachineProfile()->GetGrades( pSong, GAMESTATE->GetCurrentStyle()->m_StepsType, iCounts );
for( int i=GRADE_TIER_01; i<NUM_GRADES; ++i ) for( int i=GRADE_TIER01; i<NUM_GRADES; ++i )
{ {
Grade g = (Grade)i; Grade g = (Grade)i;
if( iCounts[i] > 0 ) if( iCounts[i] > 0 )
stepmania/src/StatsManager.cpp
+1 -1
View File
@@ -218,7 +218,7 @@ static Grade GetBestGrade()
static Grade GetWorstGrade() static Grade GetWorstGrade()
{ {
Grade g = GRADE_TIER_01; Grade g = GRADE_TIER01;
FOREACH_EnabledPlayer( pn ) FOREACH_EnabledPlayer( pn )
g = max( g, STATSMAN->m_CurStageStats.m_player[pn].GetGrade() ); g = max( g, STATSMAN->m_CurStageStats.m_player[pn].GetGrade() );
return g; return g;
stepmania/src/UnlockManager.cpp
+9 -9
View File
@@ -152,8 +152,8 @@ static float GetArcadePoints( const Profile *pProfile )
{ {
switch(g) switch(g)
{ {
case GRADE_TIER_01: case GRADE_TIER01:
case GRADE_TIER_02: fAP += 9 * pProfile->m_iNumStagesPassedByGrade[g]; break; case GRADE_TIER02: fAP += 9 * pProfile->m_iNumStagesPassedByGrade[g]; break;
default: fAP += 1 * pProfile->m_iNumStagesPassedByGrade[g]; break; default: fAP += 1 * pProfile->m_iNumStagesPassedByGrade[g]; break;
case GRADE_FAILED: case GRADE_FAILED:
@@ -187,13 +187,13 @@ static float GetSongPoints( const Profile *pProfile )
{ {
switch( g ) switch( g )
{ {
case GRADE_TIER_01:/*AAAA*/ fSP += 20 * pProfile->m_iNumStagesPassedByGrade[g]; break; case GRADE_TIER01:/*AAAA*/ fSP += 20 * pProfile->m_iNumStagesPassedByGrade[g]; break;
case GRADE_TIER_02:/*AAA*/ fSP += 10* pProfile->m_iNumStagesPassedByGrade[g]; break; case GRADE_TIER02:/*AAA*/ fSP += 10* pProfile->m_iNumStagesPassedByGrade[g]; break;
case GRADE_TIER_03:/*AA*/ fSP += 5* pProfile->m_iNumStagesPassedByGrade[g]; break; case GRADE_TIER03:/*AA*/ fSP += 5* pProfile->m_iNumStagesPassedByGrade[g]; break;
case GRADE_TIER_04:/*A*/ fSP += 4* pProfile->m_iNumStagesPassedByGrade[g]; break; case GRADE_TIER04:/*A*/ fSP += 4* pProfile->m_iNumStagesPassedByGrade[g]; break;
case GRADE_TIER_05:/*B*/ fSP += 3* pProfile->m_iNumStagesPassedByGrade[g]; break; case GRADE_TIER05:/*B*/ fSP += 3* pProfile->m_iNumStagesPassedByGrade[g]; break;
case GRADE_TIER_06:/*C*/ fSP += 2* pProfile->m_iNumStagesPassedByGrade[g]; break; case GRADE_TIER06:/*C*/ fSP += 2* pProfile->m_iNumStagesPassedByGrade[g]; break;
case GRADE_TIER_07:/*D*/ fSP += 1* pProfile->m_iNumStagesPassedByGrade[g]; break; case GRADE_TIER07:/*D*/ fSP += 1* pProfile->m_iNumStagesPassedByGrade[g]; break;
case GRADE_FAILED: case GRADE_FAILED:
case GRADE_NO_DATA: case GRADE_NO_DATA:
; // no points ; // no points