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

Keep track of played and passed songs separately; it's too much

Browse Source 
of a hassle to try to derive one from the other.

always record m_SelectedOptions on the first song played
This commit is contained in:
Glenn Maynard
2003-02-24 02:45:01 +00:00
parent fc859e5ca5
commit c6ccc82b98
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenGameplay.cpp
+17 -9
View File
@@ -510,6 +510,13 @@ bool ScreenGameplay::IsLastSong()
void ScreenGameplay::LoadNextSong()
{
GAMESTATE->ResetMusicStatistics();
int p;
for( p=0; p<NUM_PLAYERS; p++ )
{
// If it's the first song, record the options the player selected for later.
if( GAMESTATE->m_CurStageStats.iSongsPlayed[p] == 0 )
GAMESTATE->m_SelectedOptions[p] = GAMESTATE->m_PlayerOptions[p];
}
switch( GAMESTATE->m_PlayMode )
{
@@ -519,14 +526,9 @@ void ScreenGameplay::LoadNextSong()
case PLAY_MODE_ONI:
case PLAY_MODE_ENDLESS:
{
int p;
for( p=0; p<NUM_PLAYERS; p++ )
{
m_textCourseSongNumber[p].SetText( ssprintf("%d", GAMESTATE->m_CurStageStats.iSongsPassed[p]+1) );
// If it's the first song, record the options the player selected for later.
if( GAMESTATE->m_CurStageStats.iSongsPassed[p] == 0 )
GAMESTATE->m_SelectedOptions[p] = GAMESTATE->m_PlayerOptions[p];
}
m_textCourseSongNumber[p].SetText( ssprintf("%d", GAMESTATE->m_CurStageStats.iSongsPlayed[p]+1) );
int iPlaySongIndex = GAMESTATE->GetCourseSongIndex();
iPlaySongIndex %= m_apCourseSongs.size();
GAMESTATE->m_pCurSong = m_apCourseSongs[iPlaySongIndex];
@@ -552,7 +554,7 @@ void ScreenGameplay::LoadNextSong()
m_textSongOptions.SetText( GAMESTATE->m_SongOptions.GetString() );
for( int p=0; p<NUM_PLAYERS; p++ )
for( p=0; p<NUM_PLAYERS; p++ )
{
if( !GAMESTATE->IsPlayerEnabled(p) )
continue;
@@ -1226,8 +1228,14 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
}
for( p=0; p<NUM_PLAYERS; p++ )
if( GAMESTATE->IsPlayerEnabled(p) && !GAMESTATE->m_CurStageStats.bFailed[p] )
{
if( !GAMESTATE->IsPlayerEnabled(p) )
continue;
GAMESTATE->m_CurStageStats.iSongsPlayed[p]++;
if( !GAMESTATE->m_CurStageStats.bFailed[p] )
GAMESTATE->m_CurStageStats.iSongsPassed[p]++;
}
if( !IsLastSong() )
{