[ScreenSelectMusic] Added NullScoreString metric.

This commit is contained in:
AJ Kelly
2011-05-02 17:15:41 -05:00
parent d69bbdbb9d
commit 054747b55c
4 changed files with 18 additions and 1 deletions
+13
View File
@@ -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]
+2
View File
@@ -1974,6 +1974,8 @@ CDTitleBackCommand=
CDTitleOnCommand=visible,false
CDTitleOffCommand=
#
NullScoreString=string.format("% 9i",0)
#
ScoreFrameP1X=
ScoreFrameP1Y=
ScoreFrameP1OnCommand=visible,false
+2 -1
View File
@@ -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<PlayerNumber> &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 );
}
}
}
+1
View File
@@ -93,6 +93,7 @@ protected:
ThemeMetric<bool> WRAP_CHANGE_STEPS;
ThemeMetric<bool> CHANGE_STEPS_WITH_GAME_BUTTONS;
ThemeMetric<bool> CHANGE_GROUPS_WITH_GAME_BUTTONS;
ThemeMetric<RString> 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; }