From 921c1446c4b184097dc5dff8efb06e41cb0f4cb8 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 25 Feb 2005 04:18:28 +0000 Subject: [PATCH] cleanup --- stepmania/src/ScreenGameplay.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index d682009f8e..c853f11dda 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -869,14 +869,6 @@ void ScreenGameplay::SetupSong( PlayerNumber p, int iSongIndex ) GAMESTATE->m_pPlayerState[p]->m_CurrentPlayerOptions = GAMESTATE->m_pPlayerState[p]->m_PlayerOptions; } -static int GetMaxSongsPlayed() -{ - int SongNumber = 0; - FOREACH_EnabledPlayer(p) - SongNumber = max( SongNumber, STATSMAN->m_CurStageStats.m_player[p].iSongsPlayed ); - return SongNumber; -} - void ScreenGameplay::LoadCourseSongNumber( int SongNumber ) { if( !GAMESTATE->IsCourseMode() ) @@ -899,7 +891,7 @@ void ScreenGameplay::LoadNextSong() m_textCourseSongNumber[p].SetText( ssprintf("%d", STATSMAN->m_CurStageStats.m_player[p].iSongsPlayed) ); } - LoadCourseSongNumber( GetMaxSongsPlayed() ); + LoadCourseSongNumber( GAMESTATE->GetCourseSongIndex() ); int iPlaySongIndex = GAMESTATE->GetCourseSongIndex(); iPlaySongIndex %= m_apSongsQueue.size(); @@ -2169,7 +2161,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM ) GAMESTATE->m_pCurSong.Set( pCurSong ); m_NextSongOut.StartTransitioning( SM_LoadNextSong ); - LoadCourseSongNumber( GetMaxSongsPlayed()+1 ); + LoadCourseSongNumber( GAMESTATE->GetCourseSongIndex()+1 ); COMMAND( m_sprCourseSongNumber, "ChangeIn" ); return; }