From 3becbefc927908fbb55052d77ee01fc1380a43f2 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sun, 20 Aug 2006 19:25:19 +0000 Subject: [PATCH] TotalTime in xml --- stepmania/Themes/default/metrics.ini | 8 -------- stepmania/src/ScreenSelectMusic.cpp | 15 --------------- stepmania/src/ScreenSelectMusic.h | 1 - 3 files changed, 24 deletions(-) diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index ad16297266..7c7e66f3f9 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -491,10 +491,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 -TotalTimeX=SCREEN_CENTER_X-156 -TotalTimeY=SCREEN_CENTER_Y+190 -TotalTimeOnCommand=shadowlength,0;diffusealpha,0;linear,0.5;diffusealpha,1; -TotalTimeOffCommand=linear,0.5;diffusealpha,0; MusicWheelX=SCREEN_CENTER_X+160 MusicWheelY=SCREEN_CENTER_Y+4 MusicWheelOnCommand= @@ -519,10 +515,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 -TotalTimeX=SCREEN_CENTER_X-128 -TotalTimeY=SCREEN_CENTER_Y-128 -TotalTimeOnCommand=shadowlength,0;addx,-SCREEN_WIDTH;bounceend,0.5;addx,SCREEN_WIDTH -TotalTimeOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH Codes=CourseCodeDetector DoRouletteOnMenuTimer=0 ScreenBeginCommand=setupcoursestagemods diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index 4a850c329a..c9c9228078 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -132,11 +132,6 @@ void ScreenSelectMusic::Init() COMMAND( m_sprCDTitleBack, "Back" ); this->AddChild( &m_sprCDTitleBack ); - m_textTotalTime.SetName( "TotalTime" ); - m_textTotalTime.LoadFromFont( THEME->GetPathF(m_sName,"total time") ); - SET_XY( m_textTotalTime ); - this->AddChild( &m_textTotalTime ); - FOREACH_HumanPlayer( p ) { m_sprHighScoreFrame[p].SetName( ssprintf("ScoreFrameP%d",p+1) ); @@ -941,8 +936,6 @@ void ScreenSelectMusic::AfterMusicChange() m_fSampleStartSeconds = 0; m_fSampleLengthSeconds = -1; - m_textTotalTime.SetText( "" ); - switch( m_MusicWheel.GetSelectedType() ) { case TYPE_SECTION: @@ -975,8 +968,6 @@ void ScreenSelectMusic::AfterMusicChange() m_fSampleStartSeconds = pSong->m_fMusicSampleStartSeconds; m_fSampleLengthSeconds = pSong->m_fMusicSampleLengthSeconds; - m_textTotalTime.SetText( SecondsToMMSSMsMs(pSong->m_fMusicLengthSeconds) ); - SongUtil::GetSteps( pSong, m_vpSteps, GAMESTATE->GetCurrentStyle()->m_StepsType ); StepsUtil::RemoveLockedSteps( pSong, m_vpSteps ); StepsUtil::SortNotesArrayByDifficulty( m_vpSteps ); @@ -1003,12 +994,6 @@ void ScreenSelectMusic::AfterMusicChange() m_fSampleStartSeconds = 0; m_fSampleLengthSeconds = -1; - float fTotalSeconds; - if( pCourse->GetTotalSeconds(st,fTotalSeconds) ) - m_textTotalTime.SetText( SecondsToMMSSMsMs(fTotalSeconds) ); - else - m_textTotalTime.SetText( "xx:xx.xx" ); // The numbers format doesn't have a '?'. Is there a better solution? - g_sBannerPath = pCourse->m_sBannerPath; if( g_sBannerPath.empty() ) m_Banner.LoadFallback(); diff --git a/stepmania/src/ScreenSelectMusic.h b/stepmania/src/ScreenSelectMusic.h index 0849ad423c..f939c37773 100644 --- a/stepmania/src/ScreenSelectMusic.h +++ b/stepmania/src/ScreenSelectMusic.h @@ -76,7 +76,6 @@ protected: FadingBanner m_Banner; Sprite m_sprCDTitleFront, m_sprCDTitleBack; - BitmapText m_textTotalTime; Sprite m_sprHighScoreFrame[NUM_PLAYERS]; BitmapText m_textHighScore[NUM_PLAYERS]; MusicWheel m_MusicWheel;