Removing the ScoreDisplay mods.

Lua has since replaced it.

src/PercentageDisplay.cpp

@@ -137,26 +137,6 @@ void PercentageDisplay::Refresh()
 	else
 	{
 		float fPercentDancePoints = m_pPlayerStageStats->GetPercentDancePoints();
-		float fCurMaxPercentDancePoints = m_pPlayerStageStats->GetCurMaxPercentDancePoints();
-
-		if( m_bApplyScoreDisplayOptions )
-		{
-			switch( m_pPlayerState->m_PlayerOptions.GetCurrent().m_ScoreDisplay )
-			{
-			case PlayerOptions::SCORING_ADD:
-				// nothing to do
-				break;
-			case PlayerOptions::SCORING_SUBTRACT:
-				fPercentDancePoints = 1.0f - ( fCurMaxPercentDancePoints - fPercentDancePoints );
-				break;
-			case PlayerOptions::SCORING_AVERAGE:
-				if( fCurMaxPercentDancePoints == 0.0f ) // don't divide by zero fats
-					fPercentDancePoints = 0.0f;
-				else
-					fPercentDancePoints = fPercentDancePoints / fCurMaxPercentDancePoints;
-				break;
-			}
-		}
 
 		// clamp percentage - feedback is that negative numbers look weird here.
 		CLAMP( fPercentDancePoints, 0.f, 1.f );

src/PlayerOptions.cpp

@@ -45,7 +45,6 @@ void PlayerOptions::Init()
 	ZERO( m_bTransforms );
 	m_bMuteOnError = false;
 	m_FailType = FAIL_IMMEDIATE;
-	m_ScoreDisplay = SCORING_ADD;
 	m_sNoteSkin = "";
 }
 
@@ -85,7 +84,6 @@ void PlayerOptions::Approach( const PlayerOptions& other, float fDeltaSeconds )
 	for( int i=0; i<NUM_TRANSFORMS; i++ )
 		DO_COPY( m_bTransforms[i] );
 	DO_COPY( m_bMuteOnError );
-	DO_COPY( m_ScoreDisplay );
 	DO_COPY( m_FailType );
 	DO_COPY( m_sNoteSkin );
 #undef APPROACH
@@ -439,9 +437,6 @@ bool PlayerOptions::FromOneModString( const RString &sOneMod, RString &sErrorOut
 		GAMESTATE->GetDefaultPlayerOptions( po );
 		m_FailType = po.m_FailType;
 	}
-	else if( sBit == "addscore" )				m_ScoreDisplay = SCORING_ADD;
-	else if( sBit == "subtractscore" )			m_ScoreDisplay = SCORING_SUBTRACT;
-	else if( sBit == "averagescore" )			m_ScoreDisplay = SCORING_AVERAGE;
 	else if( sBit == "muteonerror" )			m_bMuteOnError = on;
 	else if( sBit == "random" )				ChooseRandomModifiers();
 	// deprecated mods/left in for compatibility
@@ -653,7 +648,6 @@ bool PlayerOptions::operator==( const PlayerOptions &other ) const
 	COMPARE(m_fScrollSpeed);
 	COMPARE(m_fScrollBPM);
 	COMPARE(m_fRandomSpeed);
-	COMPARE(m_ScoreDisplay);
 	COMPARE(m_FailType);
 	COMPARE(m_bMuteOnError);
 	COMPARE(m_fDark);
@@ -798,7 +792,6 @@ RString PlayerOptions::GetSavedPrefsString() const
 	SAVE( m_bTransforms[TRANSFORM_NOSTRETCH] );
 	SAVE( m_bTransforms[TRANSFORM_NOLIFTS] );
 	SAVE( m_bTransforms[TRANSFORM_NOFAKES] );
-	SAVE( m_ScoreDisplay );
 	SAVE( m_bMuteOnError );
 	SAVE( m_sNoteSkin );
 #undef SAVE

src/PlayerOptions.h

@@ -34,8 +34,7 @@ public:
 		m_fSkew(0), m_SpeedfSkew(1.0f),
 		m_fPassmark(0), m_SpeedfPassmark(1.0f),
 		m_fRandomSpeed(0), m_SpeedfRandomSpeed(1.0f),
-		m_bMuteOnError(false), m_FailType(FAIL_IMMEDIATE),
-		m_ScoreDisplay(SCORING_ADD)
+		m_bMuteOnError(false), m_FailType(FAIL_IMMEDIATE)
 	{
 		m_sNoteSkin = "";
 		ZERO( m_fAccels );	ONE( m_SpeedfAccels );
@@ -151,12 +150,6 @@ public:
 		SCROLL_CENTERED,
 		NUM_SCROLLS
 	};
-	enum ScoreDisplay {
-		SCORING_ADD=0,
-		SCORING_SUBTRACT,
-		SCORING_AVERAGE,
-		NUM_SCOREDISPLAYS
-	};
 
 	float GetReversePercentForColumn( int iCol ) const; // accounts for all Directions
 
@@ -198,7 +191,6 @@ public:
 	};
 	/** @brief The method for which a player can fail a song. */
 	FailType m_FailType;
-	ScoreDisplay m_ScoreDisplay;
 
 	/**
 	 * @brief The Noteskin to use.

src/ScoreDisplayNormal.cpp

@@ -46,36 +46,6 @@ void ScoreDisplayNormal::SetScore( int iNewScore )
 {
 	float fScore = (float)iNewScore;
 
-	// TODO: Remove use of PlayerNumber.
-	PlayerNumber pn = m_pPlayerState->m_PlayerNumber;
-
-	// Play some games to display the correct score -- the actual internal 
-	// score does not change at all but the displayed one can (ie: displayed 
-	// score for subtractive is MaxScore - score).
-
-	int iMaxScore = STATSMAN->m_CurStageStats.m_player[pn].m_iMaxScore;
-	int iCurMaxScore = STATSMAN->m_CurStageStats.m_player[pn].m_iCurMaxScore;
-
-	switch( m_pPlayerState->m_PlayerOptions.GetCurrent().m_ScoreDisplay )
-	{
-	case PlayerOptions::SCORING_ADD:
-		// nothing to do
-		break;
-	case PlayerOptions::SCORING_SUBTRACT:
-		fScore = iMaxScore - ( iCurMaxScore - fScore );
-		break;
-	case PlayerOptions::SCORING_AVERAGE:
-		if( iCurMaxScore == 0 ) // don't divide by zero fats
-		{
-			fScore = 0;
-		}
-		else
-		{
-			float fScoreRatio = fScore / (float)iCurMaxScore;
-			fScore = fScoreRatio * iMaxScore;
-		}
-	}
-
 	m_text.SetTargetNumber( fScore );
 }