From 771691d112e8ae9b81699146e3342c08fa4d3023 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 19 Aug 2006 05:09:18 +0000 Subject: [PATCH] NumSongs in XML --- stepmania/Themes/default/metrics.ini | 8 -------- stepmania/src/ScreenSelectMusic.cpp | 8 -------- stepmania/src/ScreenSelectMusic.h | 1 - 3 files changed, 17 deletions(-) diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 1d5806476b..34cabfd55f 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -495,10 +495,6 @@ ScoreP1SortChangeCommand=stoptweening;decelerate,0.128;x,920;sleep,0.128;acceler ScoreP2SortChangeCommand=stoptweening;decelerate,0.128;x,920;sleep,0.128;accelerate,0.25;x,269 ScoreFrameP1SortChangeCommand=stoptweening;decelerate,0.128;x,920;sleep,0.128;accelerate,0.25;x,58 ScoreFrameP2SortChangeCommand=stoptweening;decelerate,0.128;x,920;sleep,0.128;accelerate,0.25;x,269 -NumSongsX= -NumSongsY= -NumSongsOnCommand=hidden,1 -NumSongsOffCommand= TotalTimeX=SCREEN_CENTER_X-156 TotalTimeY=SCREEN_CENTER_Y+190 TotalTimeOnCommand=shadowlength,0;diffusealpha,0;linear,0.5;diffusealpha,1; @@ -527,10 +523,6 @@ ExplanationX=SCREEN_CENTER_X-188 ExplanationY=SCREEN_CENTER_Y-172 ExplanationOnCommand=addx,-SCREEN_WIDTH;sleep,0.5;bounceend,0.5;addx,SCREEN_WIDTH ExplanationOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH -NumSongsX=SCREEN_CENTER_X-262 -NumSongsY=SCREEN_CENTER_Y-126 -NumSongsOnCommand=shadowlength,0;addx,-SCREEN_WIDTH;bounceend,0.5;addx,SCREEN_WIDTH -NumSongsOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH TotalTimeX=SCREEN_CENTER_X-128 TotalTimeY=SCREEN_CENTER_Y-128 TotalTimeOnCommand=shadowlength,0;addx,-SCREEN_WIDTH;bounceend,0.5;addx,SCREEN_WIDTH diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index bc9571c9aa..a1a9512ef9 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -137,11 +137,6 @@ void ScreenSelectMusic::Init() COMMAND( m_sprCDTitleBack, "Back" ); this->AddChild( &m_sprCDTitleBack ); - m_textNumSongs.SetName( "NumSongs" ); - m_textNumSongs.LoadFromFont( THEME->GetPathF(m_sName,"num songs") ); - SET_XY( m_textNumSongs ); - this->AddChild( &m_textNumSongs ); - m_textTotalTime.SetName( "TotalTime" ); m_textTotalTime.LoadFromFont( THEME->GetPathF(m_sName,"total time") ); SET_XY( m_textTotalTime ); @@ -949,7 +944,6 @@ void ScreenSelectMusic::AfterMusicChange() m_fSampleStartSeconds = 0; m_fSampleLengthSeconds = -1; - m_textNumSongs.SetText( "" ); m_textTotalTime.SetText( "" ); switch( m_MusicWheel.GetSelectedType() ) @@ -984,7 +978,6 @@ void ScreenSelectMusic::AfterMusicChange() m_fSampleStartSeconds = pSong->m_fMusicSampleStartSeconds; m_fSampleLengthSeconds = pSong->m_fMusicSampleLengthSeconds; - m_textNumSongs.SetText( ssprintf("%d", SongManager::GetNumStagesForSong(pSong) ) ); m_textTotalTime.SetText( SecondsToMMSSMsMs(pSong->m_fMusicLengthSeconds) ); SongUtil::GetSteps( pSong, m_vpSteps, GAMESTATE->GetCurrentStyle()->m_StepsType ); @@ -1015,7 +1008,6 @@ void ScreenSelectMusic::AfterMusicChange() m_fSampleStartSeconds = 0; m_fSampleLengthSeconds = -1; - m_textNumSongs.SetText( ssprintf("%d", pCourse->GetEstimatedNumStages()) ); float fTotalSeconds; if( pCourse->GetTotalSeconds(st,fTotalSeconds) ) m_textTotalTime.SetText( SecondsToMMSSMsMs(fTotalSeconds) ); diff --git a/stepmania/src/ScreenSelectMusic.h b/stepmania/src/ScreenSelectMusic.h index a9206bfa91..25cbc21eb7 100644 --- a/stepmania/src/ScreenSelectMusic.h +++ b/stepmania/src/ScreenSelectMusic.h @@ -77,7 +77,6 @@ protected: FadingBanner m_Banner; Sprite m_sprCDTitleFront, m_sprCDTitleBack; - BitmapText m_textNumSongs; BitmapText m_textTotalTime; Sprite m_sprHighScoreFrame[NUM_PLAYERS]; BitmapText m_textHighScore[NUM_PLAYERS];