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

simplify

Browse Source
This commit is contained in:
Glenn Maynard
2005-01-30 03:08:42 +00:00
parent 64e3593d49
commit e73b073e04
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenGameplay.cpp
+7 -10
View File
@@ -78,10 +78,8 @@ const ScreenMessage SM_LoadNextSong = ScreenMessage(SM_User+11);
// received while STATE_OUTRO // received while STATE_OUTRO
const ScreenMessage SM_SaveChangedBeforeGoingBack = ScreenMessage(SM_User+20); const ScreenMessage SM_SaveChangedBeforeGoingBack = ScreenMessage(SM_User+20);
const ScreenMessage SM_GoToScreenAfterBack = ScreenMessage(SM_User+21); const ScreenMessage SM_GoToScreenAfterBack = ScreenMessage(SM_User+21);
const ScreenMessage SM_GoToStateAfterCleared= ScreenMessage(SM_User+22);
const ScreenMessage SM_BeginFailed = ScreenMessage(SM_User+30); const ScreenMessage SM_BeginFailed = ScreenMessage(SM_User+30);
const ScreenMessage SM_GoToScreenAfterFail = ScreenMessage(SM_User+31);
// received while STATE_INTRO // received while STATE_INTRO
const ScreenMessage SM_StartHereWeGo = ScreenMessage(SM_User+40); const ScreenMessage SM_StartHereWeGo = ScreenMessage(SM_User+40);
@@ -2199,7 +2197,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
if( GAMESTATE->HasEarnedExtraStage() ) if( GAMESTATE->HasEarnedExtraStage() )
{ {
TweenOffScreen(); TweenOffScreen();
m_Extra.StartTransitioning( SM_GoToStateAfterCleared ); m_Extra.StartTransitioning( SM_GoToNextScreen );
SOUND->PlayOnceFromAnnouncer( "gameplay extra" ); SOUND->PlayOnceFromAnnouncer( "gameplay extra" );
} }
else else
@@ -2215,16 +2213,16 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
switch( winner ) switch( winner )
{ {
case PLAYER_INVALID: case PLAYER_INVALID:
m_Draw.StartTransitioning( SM_GoToStateAfterCleared ); m_Draw.StartTransitioning( SM_GoToNextScreen );
break; break;
default: default:
m_Win[winner].StartTransitioning( SM_GoToStateAfterCleared ); m_Win[winner].StartTransitioning( SM_GoToNextScreen );
break; break;
} }
} }
break; break;
default: default:
m_Cleared.StartTransitioning( SM_GoToStateAfterCleared ); m_Cleared.StartTransitioning( SM_GoToNextScreen );
break; break;
} }
@@ -2334,12 +2332,11 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
SCREENMAN->SetNewScreen( PREV_SCREEN ); SCREENMAN->SetNewScreen( PREV_SCREEN );
break; break;
case SM_GoToStateAfterCleared: case SM_GoToNextScreen:
case SM_GoToScreenAfterFail:
if( m_bChangedOffsetOrBPM ) if( m_bChangedOffsetOrBPM )
{ {
m_bChangedOffsetOrBPM = false; m_bChangedOffsetOrBPM = false;
ShowSavePrompt( SM ); ShowSavePrompt( SM_GoToNextScreen );
break; break;
} }
@@ -2359,7 +2356,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
m_pSoundMusic->StopPlaying(); m_pSoundMusic->StopPlaying();
m_soundAssistTick.StopPlaying(); /* Stop any queued assist ticks. */ m_soundAssistTick.StopPlaying(); /* Stop any queued assist ticks. */
TweenOffScreen(); TweenOffScreen();
m_Failed.StartTransitioning( SM_GoToScreenAfterFail ); m_Failed.StartTransitioning( SM_GoToNextScreen );
// show the survive time if extra stage // show the survive time if extra stage
if( GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2() ) if( GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2() )