handle no extra stage in event mode in HasEarnedExtraStage

This commit is contained in:
Glenn Maynard
2003-02-04 21:45:42 +00:00
parent a2f96a215c
commit 65e6ca4972
2 changed files with 10 additions and 18 deletions
+1 -2
View File
@@ -280,8 +280,7 @@ ScreenEvaluation::ScreenEvaluation( bool bSummary )
m_bTryExtraStage =
GAMESTATE->HasEarnedExtraStage() &&
m_ResultMode==RM_ARCADE_STAGE &&
!PREFSMAN->m_bEventMode;
m_ResultMode==RM_ARCADE_STAGE;
//
// Init ResultMode-specific displays
+9 -16
View File
@@ -1246,25 +1246,18 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
if( GAMESTATE->m_SongOptions.m_FailType == SongOptions::FAIL_END_OF_SONG && AllFailedEarlier() )
{
this->SendScreenMessage( SM_BeginFailed, 0 );
return;
}
m_StarWipe.CloseWipingRight( SM_None );
// do they deserve an extra stage?
if( GAMESTATE->HasEarnedExtraStage() )
this->SendScreenMessage( SM_ShowTryExtraStage, 1 );
else
{
m_StarWipe.CloseWipingRight( SM_None );
// do they deserve an extra stage?
bool bTryExtraStage = GAMESTATE->HasEarnedExtraStage();
if( PREFSMAN->m_bEventMode )
bTryExtraStage = false;
if( bTryExtraStage )
{
this->SendScreenMessage( SM_ShowTryExtraStage, 1 );
}
else
{
this->SendScreenMessage( SM_ShowCleared, 1 );
SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("gameplay cleared") );
}
this->SendScreenMessage( SM_ShowCleared, 1 );
SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("gameplay cleared") );
}
}
}