rename iMaxScoreToNow -> iCurMaxScore, to look like iCurCombo, iCurMissCombo

This commit is contained in:
Glenn Maynard
2005-01-10 15:26:21 +00:00
parent c7c28b9aea
commit faa835f980
4 changed files with 11 additions and 11 deletions
+4 -4
View File
@@ -59,18 +59,18 @@ void ScoreDisplayNormal::SetScore( int iNewScore )
if( m_pPlayerState->m_CurrentPlayerOptions.m_ScoreDisplay == PlayerOptions::SCORING_SUBTRACT )
{
if( iNewScore == 0 && g_CurStageStats.m_player[pn].iMaxScoreToNow == 0 )
if( iNewScore == 0 && g_CurStageStats.m_player[pn].iCurMaxScore == 0 )
m_iScore = g_CurStageStats.m_player[pn].iMaxScore;
else
m_iScore = g_CurStageStats.m_player[pn].iMaxScore - ( g_CurStageStats.m_player[pn].iMaxScoreToNow - iNewScore );
m_iScore = g_CurStageStats.m_player[pn].iMaxScore - ( g_CurStageStats.m_player[pn].iCurMaxScore - iNewScore );
}
else if( m_pPlayerState->m_CurrentPlayerOptions.m_ScoreDisplay == PlayerOptions::SCORING_AVERAGE )
{
if( g_CurStageStats.m_player[pn].iMaxScoreToNow == 0 ) // don't divide by zero fats
if( g_CurStageStats.m_player[pn].iCurMaxScore == 0 ) // don't divide by zero fats
m_iScore = 0;
else
{
float scoreRatio = (float) iNewScore / (float) g_CurStageStats.m_player[pn].iMaxScoreToNow;
float scoreRatio = (float) iNewScore / (float) g_CurStageStats.m_player[pn].iCurMaxScore;
m_iScore = (int) ( scoreRatio * g_CurStageStats.m_player[pn].iMaxScore );
}
}