From 054747b55ccc0230327e275727dd780465640fdb Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Mon, 2 May 2011 17:15:41 -0500 Subject: [PATCH] [ScreenSelectMusic] Added NullScoreString metric. --- Docs/Changelog_sm5.txt | 13 +++++++++++++ Themes/_fallback/metrics.ini | 2 ++ src/ScreenSelectMusic.cpp | 3 ++- src/ScreenSelectMusic.h | 1 + 4 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 Docs/Changelog_sm5.txt diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt new file mode 100644 index 0000000000..a756a24d1b --- /dev/null +++ b/Docs/Changelog_sm5.txt @@ -0,0 +1,13 @@ +StepMania 5 Changelog +________________________________________________________________________________ +The StepMania 5 Changelog covers all post-sm-ssc changes. For a list of changes +from StepMania 4 alpha 5 to sm-ssc v1.2.5, see Changelog_sm-ssc.txt. +________________________________________________________________________________ + +================================================================================ +StepMania 5.0 $NEXT | 20110xyy +-------------------------------------------------------------------------------- + +2011/05/02 +---------- +* [ScreenSelectMusic] Added NullScoreString metric. [AJ] \ No newline at end of file diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index 95db410a9f..f9484c2717 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -1974,6 +1974,8 @@ CDTitleBackCommand= CDTitleOnCommand=visible,false CDTitleOffCommand= # +NullScoreString=string.format("% 9i",0) +# ScoreFrameP1X= ScoreFrameP1Y= ScoreFrameP1OnCommand=visible,false diff --git a/src/ScreenSelectMusic.cpp b/src/ScreenSelectMusic.cpp index a866cbfa91..fe4aee3aab 100644 --- a/src/ScreenSelectMusic.cpp +++ b/src/ScreenSelectMusic.cpp @@ -92,6 +92,7 @@ void ScreenSelectMusic::Init() TWO_PART_CONFIRMS_ONLY.Load( m_sName, "TwoPartConfirmsOnly" ); TWO_PART_TIMER_SECONDS.Load( m_sName, "TwoPartTimerSeconds" ); WRAP_CHANGE_STEPS.Load( m_sName, "WrapChangeSteps" ); + NULL_SCORE_STRING.Load( m_sName, "NullScoreString" ); // To allow changing steps with gamebuttons -DaisuMaster CHANGE_STEPS_WITH_GAME_BUTTONS.Load( m_sName, "ChangeStepsWithGameButtons" ); CHANGE_GROUPS_WITH_GAME_BUTTONS.Load( m_sName, "ChangeGroupsWithGameButtons" ); @@ -1530,7 +1531,7 @@ void ScreenSelectMusic::AfterStepsOrTrailChange( const vector &vpn { // The numbers shouldn't stay if the current selection is NULL. // todo: Let themers set the text value instead of just using 0. -aj - m_textHighScore[pn].SetText( ssprintf("%*i", NUM_SCORE_DIGITS, 0) ); + m_textHighScore[pn].SetText( NULL_SCORE_STRING ); } } } diff --git a/src/ScreenSelectMusic.h b/src/ScreenSelectMusic.h index ad117bce74..d1c22c4ebf 100644 --- a/src/ScreenSelectMusic.h +++ b/src/ScreenSelectMusic.h @@ -93,6 +93,7 @@ protected: ThemeMetric WRAP_CHANGE_STEPS; ThemeMetric CHANGE_STEPS_WITH_GAME_BUTTONS; ThemeMetric CHANGE_GROUPS_WITH_GAME_BUTTONS; + ThemeMetric NULL_SCORE_STRING; bool CanChangeSong() const { return m_SelectionState == SelectionState_SelectingSong; } bool CanChangeSteps() const { return TWO_PART_SELECTION ? m_SelectionState == SelectionState_SelectingSteps : m_SelectionState == SelectionState_SelectingSong; }