From 8c89672c894fd85a6faf301b2acf40e069986a2f Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 10 Jan 2005 15:10:02 +0000 Subject: [PATCH] float m_fScoreDisplay -> ScoreDisplay m_ScoreDisplay minor cleanup --- stepmania/src/PlayerOptions.cpp | 11 +++++------ stepmania/src/PlayerOptions.h | 2 +- stepmania/src/ScoreDisplayNormal.cpp | 14 +++++--------- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/stepmania/src/PlayerOptions.cpp b/stepmania/src/PlayerOptions.cpp index 93bb6b2c21..78a81ea42d 100644 --- a/stepmania/src/PlayerOptions.cpp +++ b/stepmania/src/PlayerOptions.cpp @@ -33,7 +33,7 @@ void PlayerOptions::Init() ZERO( m_bTurns ); ZERO( m_bTransforms ); m_bProTiming = false; - m_fScoreDisplay = SCORING_ADD; + m_ScoreDisplay = SCORING_ADD; m_sPositioning = ""; // "null" m_sNoteSkin = "default"; } @@ -317,12 +317,11 @@ void PlayerOptions::FromString( CString sOptions ) else if ( sBit == "randomspeed" ) SET_FLOAT( fRandomSpeed ) else if ( sBit == "addscore" ) - m_fScoreDisplay = SCORING_ADD; + m_ScoreDisplay = SCORING_ADD; else if ( sBit == "subtractscore" ) - m_fScoreDisplay = SCORING_SUBTRACT; + m_ScoreDisplay = SCORING_SUBTRACT; else if ( sBit == "averagescore" ) - m_fScoreDisplay = SCORING_AVERAGE; - + m_ScoreDisplay = SCORING_AVERAGE; } } @@ -524,7 +523,7 @@ bool PlayerOptions::operator==( const PlayerOptions &other ) const COMPARE(m_fScrollSpeed); COMPARE(m_fScrollBPM); COMPARE(m_fRandomSpeed); - COMPARE(m_fScoreDisplay); + COMPARE(m_ScoreDisplay); COMPARE(m_fDark); COMPARE(m_fBlind); COMPARE(m_fCover); diff --git a/stepmania/src/PlayerOptions.h b/stepmania/src/PlayerOptions.h index 0b5159cc78..f22cacc351 100644 --- a/stepmania/src/PlayerOptions.h +++ b/stepmania/src/PlayerOptions.h @@ -125,7 +125,7 @@ struct PlayerOptions bool m_bTurns[NUM_TURNS]; bool m_bTransforms[NUM_TRANSFORMS]; bool m_bProTiming; - float m_fScoreDisplay; + ScoreDisplay m_ScoreDisplay; CString m_sPositioning; /* The current positioning mode, or empty to use the normal positions. */ CString m_sNoteSkin; diff --git a/stepmania/src/ScoreDisplayNormal.cpp b/stepmania/src/ScoreDisplayNormal.cpp index bb3b75d9a1..e50a3ef620 100644 --- a/stepmania/src/ScoreDisplayNormal.cpp +++ b/stepmania/src/ScoreDisplayNormal.cpp @@ -57,24 +57,20 @@ void ScoreDisplayNormal::SetScore( int iNewScore ) PlayerNumber pn = m_pPlayerState->m_PlayerNumber; - if ( m_pPlayerState->m_CurrentPlayerOptions.m_fScoreDisplay == PlayerOptions::SCORING_SUBTRACT ) + 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].iMaxScoreToNow == 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 ); - } } - else if ( m_pPlayerState->m_CurrentPlayerOptions.m_fScoreDisplay == PlayerOptions::SCORING_AVERAGE ) + 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].iMaxScoreToNow == 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].iMaxScoreToNow; m_iScore = (int) ( scoreRatio * g_CurStageStats.m_player[pn].iMaxScore ); } }