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

Restore user-selected options when backing out of a song/course

Browse Source 
to the selection menu.
This commit is contained in:
Glenn Maynard
2003-02-22 21:58:02 +00:00
parent 7877e7689a
commit fb222eadf7
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenGameplay.cpp
+7 -2
View File
@@ -538,6 +538,7 @@ void ScreenGameplay::LoadNextSong()
GAMESTATE->m_PlayerOptions[p] = GAMESTATE->m_SelectedOptions[p]; GAMESTATE->m_PlayerOptions[p] = GAMESTATE->m_SelectedOptions[p];
// Put courses options into effect. // Put courses options into effect.
GAMESTATE->m_PlayerOptions[p].FromString( m_asCourseModifiers[iPlaySongIndex] ); GAMESTATE->m_PlayerOptions[p].FromString( m_asCourseModifiers[iPlaySongIndex] );
GAMESTATE->m_SongOptions.Init();
GAMESTATE->m_SongOptions.FromString( m_asCourseModifiers[iPlaySongIndex] ); GAMESTATE->m_SongOptions.FromString( m_asCourseModifiers[iPlaySongIndex] );
} }
} }
@@ -1116,6 +1117,7 @@ void ShowSavePrompt( ScreenMessage SM_SendWhenDone )
void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM ) void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
{ {
int p;
switch( SM ) switch( SM )
{ {
// received while STATE_INTRO // received while STATE_INTRO
@@ -1229,7 +1231,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
if( !IsLastSong() ) if( !IsLastSong() )
{ {
for( int p=0; p<NUM_PLAYERS; p++ ) for( p=0; p<NUM_PLAYERS; p++ )
if( GAMESTATE->IsPlayerEnabled(p) && !GAMESTATE->m_CurStageStats.bFailed[p] ) if( GAMESTATE->IsPlayerEnabled(p) && !GAMESTATE->m_CurStageStats.bFailed[p] )
m_pLifeMeter[p]->OnSongEnded(); // give a little life back between stages m_pLifeMeter[p]->OnSongEnded(); // give a little life back between stages
m_OniFade.CloseWipingRight( SM_BeginLoadingNextSong ); m_OniFade.CloseWipingRight( SM_BeginLoadingNextSong );
@@ -1420,6 +1422,10 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
break; break;
case SM_GoToScreenAfterBack: case SM_GoToScreenAfterBack:
/* Reset options. (Should this be done in ScreenSelect*?) */
for( p=0; p<NUM_PLAYERS; p++ )
GAMESTATE->m_PlayerOptions[p] = GAMESTATE->m_SelectedOptions[p];
GAMESTATE->m_SongOptions.Init();
switch( GAMESTATE->m_PlayMode ) switch( GAMESTATE->m_PlayMode )
{ {
case PLAY_MODE_ARCADE: case PLAY_MODE_ARCADE:
@@ -1450,7 +1456,6 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
m_soundMusic.StopPlaying(); m_soundMusic.StopPlaying();
m_StarWipe.SetTransitionTime( 1.5f ); m_StarWipe.SetTransitionTime( 1.5f );
m_StarWipe.CloseWipingRight( SM_None ); m_StarWipe.CloseWipingRight( SM_None );
int p;
for( p=0; p<NUM_PLAYERS; p++ ) for( p=0; p<NUM_PLAYERS; p++ )
if( GAMESTATE->IsPlayerEnabled(p) ) if( GAMESTATE->IsPlayerEnabled(p) )
m_Player[p].FadeToFail(); m_Player[p].FadeToFail();