From cb38eae9ba6cfdf3ead06dca4f68b2439fd7b700 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Mon, 6 Jun 2011 18:55:49 -0400 Subject: [PATCH] Removing the ScoreDisplay mods. Lua has since replaced it. --- Docs/Changelog_sm5.txt | 5 +++++ Themes/_fallback/metrics.ini | 1 - Themes/default/metrics.ini | 4 ++-- src/PercentageDisplay.cpp | 20 -------------------- src/PlayerOptions.cpp | 7 ------- src/PlayerOptions.h | 10 +--------- src/ScoreDisplayNormal.cpp | 30 ------------------------------ 7 files changed, 8 insertions(+), 69 deletions(-) diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt index 6dc057dfb3..194703cba3 100644 --- a/Docs/Changelog_sm5.txt +++ b/Docs/Changelog_sm5.txt @@ -8,6 +8,11 @@ ________________________________________________________________________________ StepMania 5.0 Preview 2 | 20110??? -------------------------------------------------------------------------------- +2011/06/06 +---------- +* [PlayerOptions] Removed the ScoreDisplay mod choices. Use lua to make your + own scoring formulas that work in reverse instead. [Wolfman2000] + 2011/06/04 ---------- * Changed default MusicWheelSwitchSpeed to 15 (was 10). [AJ] diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index fbe5f51939..18712e9a16 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -2884,7 +2884,6 @@ Line11="list,Attacks" Line12="list,PlayerAutoPlay" Line13="list,Hide" Line14="list,Persp" -Line15="list,ScoreDisplay" Line16="list,Steps" Line17="list,Characters" diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index 65558ea9ca..85ecd68ca8 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -1216,7 +1216,7 @@ ItemsLongRowSharedX=SCREEN_CENTER_X [ScreenTestInput] [ScreenOptionsSystemDirection] -LineNames="1,2,3,4,5,6,7,8,9,FlashyCombo,RollCombo,10,11,12,13,14,15,16,LF,17,18,19,20,21,22" +LineNames="1,2,3,4,5,6,7,8,9,FlashyCombo,RollCombo,10,11,12,13,14,16,LF,17,18,19,20,21,22" LineLF="lua,UserPrefLongFail()" LineRollCombo="lua,UserPrefComboOnRolls()" LineFlashyCombo="lua,UserPrefFlashyCombo()" @@ -1224,7 +1224,7 @@ LineFlashyCombo="lua,UserPrefFlashyCombo()" [ScreenOptionsGraphicsSound] [ScreenOptionsAdvanced] -LineNames="Score,3,4,8,11,13,14,15,16,28,29,30,RollCombo" +LineNames="Score,3,4,8,11,13,14,16,28,29,30,RollCombo" LineRollCombo="lua,UserPrefComboOnRolls()" [ScreenAppearanceOptions] diff --git a/src/PercentageDisplay.cpp b/src/PercentageDisplay.cpp index 502f8f6989..503f153eb7 100644 --- a/src/PercentageDisplay.cpp +++ b/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 ); diff --git a/src/PlayerOptions.cpp b/src/PlayerOptions.cpp index 363851cd6a..965acfd223 100644 --- a/src/PlayerOptions.cpp +++ b/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; iGetDefaultPlayerOptions( 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 diff --git a/src/PlayerOptions.h b/src/PlayerOptions.h index c6ea986160..9f4017bc42 100644 --- a/src/PlayerOptions.h +++ b/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. diff --git a/src/ScoreDisplayNormal.cpp b/src/ScoreDisplayNormal.cpp index f34613a1d9..dad9eeed02 100644 --- a/src/ScoreDisplayNormal.cpp +++ b/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 ); }