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

cleanup

Browse Source
This commit is contained in:
Glenn Maynard
2005-02-25 04:18:28 +00:00
parent 40faf9e983
commit 921c1446c4
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenGameplay.cpp
+2 -10
View File
@@ -869,14 +869,6 @@ void ScreenGameplay::SetupSong( PlayerNumber p, int iSongIndex )
GAMESTATE->m_pPlayerState[p]->m_CurrentPlayerOptions = GAMESTATE->m_pPlayerState[p]->m_PlayerOptions; 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 ) void ScreenGameplay::LoadCourseSongNumber( int SongNumber )
{ {
if( !GAMESTATE->IsCourseMode() ) if( !GAMESTATE->IsCourseMode() )
@@ -899,7 +891,7 @@ void ScreenGameplay::LoadNextSong()
m_textCourseSongNumber[p].SetText( ssprintf("%d", STATSMAN->m_CurStageStats.m_player[p].iSongsPlayed) ); m_textCourseSongNumber[p].SetText( ssprintf("%d", STATSMAN->m_CurStageStats.m_player[p].iSongsPlayed) );
} }
LoadCourseSongNumber( GetMaxSongsPlayed() ); LoadCourseSongNumber( GAMESTATE->GetCourseSongIndex() );
int iPlaySongIndex = GAMESTATE->GetCourseSongIndex(); int iPlaySongIndex = GAMESTATE->GetCourseSongIndex();
iPlaySongIndex %= m_apSongsQueue.size(); iPlaySongIndex %= m_apSongsQueue.size();
@@ -2169,7 +2161,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
GAMESTATE->m_pCurSong.Set( pCurSong ); GAMESTATE->m_pCurSong.Set( pCurSong );
m_NextSongOut.StartTransitioning( SM_LoadNextSong ); m_NextSongOut.StartTransitioning( SM_LoadNextSong );
LoadCourseSongNumber( GetMaxSongsPlayed()+1 ); LoadCourseSongNumber( GAMESTATE->GetCourseSongIndex()+1 );
COMMAND( m_sprCourseSongNumber, "ChangeIn" ); COMMAND( m_sprCourseSongNumber, "ChangeIn" );
return; return;
} }