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

move Grade back out. It's just a cache of GetGrade.

Browse Source
This commit is contained in:
Glenn Maynard
2005-09-11 01:24:28 +00:00
parent 74c9d0058a
commit 85d6e5e22e
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenEvaluation.cpp
+16 -11
View File
@@ -246,6 +246,19 @@ void ScreenEvaluation::Init()
} }
} }
//
// Calculate grades
//
Grade grade[NUM_PLAYERS];
FOREACH_PlayerNumber( p )
{
if( GAMESTATE->IsPlayerEnabled(p) )
grade[p] = m_StageStats.m_player[p].GetGrade();
else
grade[p] = Grade_Failed;
}
// //
// update persistent statistics // update persistent statistics
// //
@@ -394,14 +407,14 @@ void ScreenEvaluation::Init()
this->AddChild( m_sprGradeFrame[p] ); this->AddChild( m_sprGradeFrame[p] );
m_Grades[p].Load( THEME->GetPathG(m_sName,"grades") ); m_Grades[p].Load( THEME->GetPathG(m_sName,"grades") );
m_Grades[p].SetGrade( p, m_StageResults[p].m_Grade ); m_Grades[p].SetGrade( p, grade[p] );
m_Grades[p].SetName( ssprintf("GradeP%d",p+1) ); m_Grades[p].SetName( ssprintf("GradeP%d",p+1) );
SET_XY_AND_ON_COMMAND( m_Grades[p] ); SET_XY_AND_ON_COMMAND( m_Grades[p] );
if( SPIN_GRADES ) if( SPIN_GRADES )
m_Grades[p].Spin(); m_Grades[p].Spin();
this->AddChild( &m_Grades[p] ); this->AddChild( &m_Grades[p] );
m_sprGrade[p].Load( THEME->GetPathG(m_sName,"grade "+GradeToString(m_StageResults[p].m_Grade)) ); m_sprGrade[p].Load( THEME->GetPathG(m_sName,"grade "+GradeToString(grade[p])) );
m_sprGrade[p]->SetName( ssprintf("GradeP%d",p+1) ); m_sprGrade[p]->SetName( ssprintf("GradeP%d",p+1) );
SET_XY_AND_ON_COMMAND( m_sprGrade[p] ); SET_XY_AND_ON_COMMAND( m_sprGrade[p] );
this->AddChild( m_sprGrade[p] ); this->AddChild( m_sprGrade[p] );
@@ -699,7 +712,7 @@ void ScreenEvaluation::Init()
Grade best_grade = Grade_NoData; Grade best_grade = Grade_NoData;
FOREACH_PlayerNumber( p ) FOREACH_PlayerNumber( p )
best_grade = min( best_grade, m_StageResults[p].m_Grade ); best_grade = min( best_grade, grade[p] );
if( PREFSMAN->m_bAllowExtraStage && m_bTryExtraStage ) if( PREFSMAN->m_bAllowExtraStage && m_bTryExtraStage )
{ {
@@ -773,14 +786,6 @@ void StageResults::CommitScores(
out[pn].Init(); out[pn].Init();
} }
FOREACH_PlayerNumber( p )
{
if( GAMESTATE->IsPlayerEnabled(p) )
out[p].m_Grade = m_StageStats.m_player[p].GetGrade();
else
out[p].m_Grade = Grade_Failed;
}
switch( GAMESTATE->m_PlayMode ) switch( GAMESTATE->m_PlayMode )
{ {
case PLAY_MODE_BATTLE: case PLAY_MODE_BATTLE: