From 5cf9e757a0f3b79ea0aca52e88d01f6d83858559 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 1 May 2007 04:29:28 +0000 Subject: [PATCH] remove unused m_sprCourseSongNumber --- stepmania/src/ScreenGameplay.cpp | 22 ---------------------- stepmania/src/ScreenGameplay.h | 2 -- 2 files changed, 24 deletions(-) diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index dae3d762d0..24ca37d32e 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -592,11 +592,6 @@ void ScreenGameplay::Init() // // Add stage / SongNumber // - m_sprCourseSongNumber.SetName( "CourseSongNumber" ); - LOAD_ALL_COMMANDS_AND_SET_XY( m_sprCourseSongNumber ); - if( GAMESTATE->IsCourseMode() ) - this->AddChild( &m_sprCourseSongNumber ); - FOREACH_EnabledPlayerNumberInfo( m_vPlayerInfo, pi ) { if( GAMESTATE->IsCourseMode() ) @@ -972,18 +967,6 @@ void ScreenGameplay::SetupSong( int iSongIndex ) } } -void ScreenGameplay::LoadCourseSongNumber( int iSongNumber ) -{ - if( !GAMESTATE->IsCourseMode() ) - return; - const RString path = THEME->GetPathG( m_sName, ssprintf("course song %i",iSongNumber+1), true ); - if( path != "" ) - m_sprCourseSongNumber.Load( path ); - else - m_sprCourseSongNumber.UnloadTexture(); - SCREENMAN->ZeroNextUpdate(); -} - void ScreenGameplay::ReloadCurrentSong() { FOREACH_EnabledPlayerInfoNotDummy( m_vPlayerInfo, pi ) @@ -1007,8 +990,6 @@ void ScreenGameplay::LoadNextSong() if( GAMESTATE->m_bMultiplayer ) STATSMAN->m_CurStageStats.m_player[GAMESTATE->m_MasterPlayerNumber].m_iSongsPlayed++; - LoadCourseSongNumber( GAMESTATE->GetCourseSongIndex() ); - int iPlaySongIndex = GAMESTATE->GetCourseSongIndex(); iPlaySongIndex %= m_apSongsQueue.size(); GAMESTATE->m_pCurSong.Set( m_apSongsQueue[iPlaySongIndex] ); @@ -2465,9 +2446,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM ) m_NextSong.Reset(); m_NextSong.PlayCommand( "Start" ); m_NextSong.StartTransitioning( SM_LoadNextSong ); - LoadCourseSongNumber( GAMESTATE->GetCourseSongIndex()+1 ); MESSAGEMAN->Broadcast( "ChangeCourseSongIn" ); - COMMAND( m_sprCourseSongNumber, "ChangeIn" ); } else if( SM == SM_LoadNextSong ) { @@ -2475,7 +2454,6 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM ) SongFinished(); MESSAGEMAN->Broadcast( "ChangeCourseSongOut" ); - COMMAND( m_sprCourseSongNumber, "ChangeOut" ); GAMESTATE->m_bLoadingNextSong = false; LoadNextSong(); diff --git a/stepmania/src/ScreenGameplay.h b/stepmania/src/ScreenGameplay.h index 7f47320d43..cbf5ae0fb0 100644 --- a/stepmania/src/ScreenGameplay.h +++ b/stepmania/src/ScreenGameplay.h @@ -153,7 +153,6 @@ protected: void SetupSong( int iSongIndex ); void ReloadCurrentSong(); virtual void LoadNextSong(); - void LoadCourseSongNumber( int iSongNumber ); void StartPlayingSong( float fMinTimeToNotes, float fMinTimeToMusic ); void GetMusicEndTiming( float &fSecondsToStartFadingOutMusic, float &fSecondsToStartTransitioningOut ); void LoadLights(); @@ -198,7 +197,6 @@ protected: AutoActor m_sprLifeFrame; CombinedLifeMeter* m_pCombinedLifeMeter; - Sprite m_sprCourseSongNumber; BitmapText m_textSongOptions; BitmapText m_Scoreboard[NUM_NSScoreBoardColumn]; // for NSMAN, so we can have a scoreboard