From c064e7cc62239beda7fd8dc52707a76fc0b63001 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Thu, 21 Apr 2011 01:56:56 -0500 Subject: [PATCH] [ScreenEvaluation] Added RollingNumbersClass metric, allowing for the ability to change which RollingNumbers class is loaded. --- Docs/Changelog_sm-ssc.txt | 2 ++ Themes/_fallback/metrics.ini | 1 + src/ScreenEvaluation.cpp | 3 ++- src/ScreenEvaluation.h | 3 ++- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Docs/Changelog_sm-ssc.txt b/Docs/Changelog_sm-ssc.txt index a886d68d52..ab77018f44 100644 --- a/Docs/Changelog_sm-ssc.txt +++ b/Docs/Changelog_sm-ssc.txt @@ -17,6 +17,8 @@ sm-ssc v1.2.5 | 201104?? -------- * [ScreenSelectMusic] Changed "Percent Frame p1" to "PercentFrame P1" for consistency. [AJ] * [LifeMeterBattery] Convert Frame to an AutoActor. [AJ] +* [ScreenEvaluation] Added RollingNumbersClass metric, allowing for the ability + to change which RollingNumbers class is loaded. [AJ] 20110420 -------- diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index d88ba5c72c..12d978bb4a 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -3243,6 +3243,7 @@ PlayerOptionsHideFailType=false MaxComboNumDigits=4 # ShowBannerArea=true +RollingNumbersClass="RollingNumbersEvaluation" ShowSharedJudgmentLineLabels=false ShowJudgmentLineW1=false ShowJudgmentLineW2=false diff --git a/src/ScreenEvaluation.cpp b/src/ScreenEvaluation.cpp index 440d44602b..76c40f03a1 100644 --- a/src/ScreenEvaluation.cpp +++ b/src/ScreenEvaluation.cpp @@ -452,6 +452,7 @@ void ScreenEvaluation::Init() } // init judgment area + ROLLING_NUMBERS_CLASS.Load( m_sName, "RollingNumbersClass" ); FOREACH_ENUM( JudgmentLine, l ) { if( l == JudgmentLine_W1 && !GAMESTATE->ShowW1() ) @@ -473,7 +474,7 @@ void ScreenEvaluation::Init() { m_textJudgmentLineNumber[l][p].LoadFromFont( THEME->GetPathF(m_sName, "JudgmentLineNumber") ); m_textJudgmentLineNumber[l][p].SetName( JudgmentLineToString(l)+ssprintf("NumberP%d",p+1) ); - m_textJudgmentLineNumber[l][p].Load( "RollingNumbersJudgment" ); + m_textJudgmentLineNumber[l][p].Load( ROLLING_NUMBERS_CLASS ); ActorUtil::LoadAllCommands( m_textJudgmentLineNumber[l][p], m_sName ); SET_XY( m_textJudgmentLineNumber[l][p] ); this->AddChild( &m_textJudgmentLineNumber[l][p] ); diff --git a/src/ScreenEvaluation.h b/src/ScreenEvaluation.h index e4565a194c..83face4a7b 100644 --- a/src/ScreenEvaluation.h +++ b/src/ScreenEvaluation.h @@ -76,7 +76,7 @@ protected: // grade area AutoActor m_sprGradeFrame[NUM_PLAYERS]; - GradeDisplay m_Grades[NUM_PLAYERS]; + GradeDisplay m_Grades[NUM_PLAYERS]; // points area bool m_bNewSongsUnlocked; @@ -115,6 +115,7 @@ protected: RageSound m_soundStart; // sound played if the player passes or fails ThemeMetric SUMMARY; + ThemeMetric ROLLING_NUMBERS_CLASS; /** @brief Did a player save a screenshot of their score? */ bool m_bSavedScreenshot[NUM_PLAYERS]; };