actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[ScreenGameplay] Added SongNumberFormat metric.

Browse Source
This commit is contained in:
AJ Kelly
2011-04-21 13:49:54 -05:00
parent 1850240fe2
commit 438930f794
4 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Docs/Changelog_sm-ssc.txt
+1
View File
@@ -19,6 +19,7 @@ sm-ssc v1.2.5 | 201104??
* [LifeMeterBattery] Convert Frame to an AutoActor. [AJ] * [LifeMeterBattery] Convert Frame to an AutoActor. [AJ]
* [ScreenEvaluation] Added RollingNumbersClass metric, allowing for the ability * [ScreenEvaluation] Added RollingNumbersClass metric, allowing for the ability
to change which RollingNumbers class is loaded. [AJ] to change which RollingNumbers class is loaded. [AJ]
* [ScreenGameplay] Added SongNumberFormat metric. [AJ]
20110420 20110420
-------- --------
Themes/_fallback/metrics.ini
+1
View File
@@ -3192,6 +3192,7 @@ DebugX=SCREEN_CENTER_X
DebugY=SCREEN_BOTTOM-72 DebugY=SCREEN_BOTTOM-72
DebugOnCommand=zoom,0.75 DebugOnCommand=zoom,0.75
# #
SongNumberFormat="%d"
SongNumberP1X=THEME:GetMetric(Var "LoadingScreen","PlayerP1OnePlayerOneSideX") - 60 SongNumberP1X=THEME:GetMetric(Var "LoadingScreen","PlayerP1OnePlayerOneSideX") - 60
SongNumberP1Y=SCREEN_TOP+24+7 SongNumberP1Y=SCREEN_TOP+24+7
SongNumberP1OnCommand=visible,false SongNumberP1OnCommand=visible,false
src/ScreenGameplay.cpp
+2 -1
View File
@@ -588,6 +588,7 @@ void ScreenGameplay::Init()
if( GAMESTATE->IsCourseMode() ) if( GAMESTATE->IsCourseMode() )
{ {
ASSERT( pi->m_ptextCourseSongNumber == NULL ); ASSERT( pi->m_ptextCourseSongNumber == NULL );
SONG_NUMBER_FORMAT.Load( m_sName, "SongNumberFormat" );
pi->m_ptextCourseSongNumber = new BitmapText; pi->m_ptextCourseSongNumber = new BitmapText;
pi->m_ptextCourseSongNumber->LoadFromFont( THEME->GetPathF(m_sName,"SongNum") ); pi->m_ptextCourseSongNumber->LoadFromFont( THEME->GetPathF(m_sName,"SongNum") );
pi->m_ptextCourseSongNumber->SetName( ssprintf("SongNumber%s",pi->GetName().c_str()) ); pi->m_ptextCourseSongNumber->SetName( ssprintf("SongNumber%s",pi->GetName().c_str()) );
@@ -1011,7 +1012,7 @@ void ScreenGameplay::LoadNextSong()
{ {
pi->GetPlayerStageStats()->m_iSongsPlayed++; pi->GetPlayerStageStats()->m_iSongsPlayed++;
if( pi->m_ptextCourseSongNumber ) if( pi->m_ptextCourseSongNumber )
pi->m_ptextCourseSongNumber->SetText( ssprintf("%d", pi->GetPlayerStageStats()->m_iSongsPassed+1) ); pi->m_ptextCourseSongNumber->SetText( ssprintf(SONG_NUMBER_FORMAT.GetValue(), pi->GetPlayerStageStats()->m_iSongsPassed+1) );
} }
if( GAMESTATE->m_bMultiplayer ) if( GAMESTATE->m_bMultiplayer )
src/ScreenGameplay.h
+1
View File
@@ -193,6 +193,7 @@ protected:
ThemeMetric<int> FAIL_ON_MISS_COMBO; ThemeMetric<int> FAIL_ON_MISS_COMBO;
ThemeMetric<bool> ALLOW_CENTER_1_PLAYER; ThemeMetric<bool> ALLOW_CENTER_1_PLAYER;
ThemeMetric<bool> UNPAUSE_WITH_START; ThemeMetric<bool> UNPAUSE_WITH_START;
ThemeMetric<RString> SONG_NUMBER_FORMAT;
bool IsLastSong(); bool IsLastSong();
void SetupSong( int iSongIndex ); void SetupSong( int iSongIndex );