undo scope hacks for VC6

This commit is contained in:
Chris Danford
2004-05-04 00:00:17 +00:00
parent d706a1e214
commit f85153b33e
+18 -23
View File
@@ -217,22 +217,21 @@ void ScreenEvaluation::Init()
// Calculate grades // Calculate grades
// //
Grade grade[NUM_PLAYERS]; Grade grade[NUM_PLAYERS];
{
FOREACH_PlayerNumber( p )
{
if( GAMESTATE->IsPlayerEnabled(p) )
grade[p] = stageStats.GetGrade( p );
else
grade[p] = GRADE_FAILED;
if( PREFSMAN->m_iScoringType == PrefsManager::SCORING_5TH ) FOREACH_PlayerNumber( p )
{
if( GAMESTATE->IsPlayerEnabled(p) )
grade[p] = stageStats.GetGrade( p );
else
grade[p] = GRADE_FAILED;
if( PREFSMAN->m_iScoringType == PrefsManager::SCORING_5TH )
{
const int ScoreBonuses[] = { 10000000, 10000000, 1000000, 100000, 10000, 1000, 100 };
if( grade[p] < (int) ARRAYSIZE(ScoreBonuses) )
{ {
const int ScoreBonuses[] = { 10000000, 10000000, 1000000, 100000, 10000, 1000, 100 }; g_CurStageStats.iBonus[p] += ScoreBonuses[(int)grade[p] ];
if( grade[p] < (int) ARRAYSIZE(ScoreBonuses) ) stageStats.iBonus[p] += ScoreBonuses[(int)grade[p] ];
{
g_CurStageStats.iBonus[p] += ScoreBonuses[(int)grade[p] ];
stageStats.iBonus[p] += ScoreBonuses[(int)grade[p] ];
}
} }
} }
} }
@@ -761,17 +760,13 @@ void ScreenEvaluation::Init()
} }
bool bOneHasNewTopRecord = false; bool bOneHasNewTopRecord = false;
{ FOREACH_PlayerNumber( p )
FOREACH_PlayerNumber( p ) if( GAMESTATE->IsPlayerEnabled(p) && (iMachineHighScoreIndex[p] != -1 || iPersonalHighScoreIndex[p] != -1) )
if( GAMESTATE->IsPlayerEnabled(p) && (iMachineHighScoreIndex[p] != -1 || iPersonalHighScoreIndex[p] != -1) ) bOneHasNewTopRecord = true;
bOneHasNewTopRecord = true;
}
Grade best_grade = GRADE_NO_DATA; Grade best_grade = GRADE_NO_DATA;
{ FOREACH_PlayerNumber( p )
FOREACH_PlayerNumber( p ) best_grade = min( best_grade, grade[p] );
best_grade = min( best_grade, grade[p] );
}
if( PREFSMAN->m_bAllowExtraStage && m_bTryExtraStage ) if( PREFSMAN->m_bAllowExtraStage && m_bTryExtraStage )
{ {