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

handle no extra stage in event mode in HasEarnedExtraStage

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenEvaluation.cpp
+1 -2
View File
@@ -280,8 +280,7 @@ ScreenEvaluation::ScreenEvaluation( bool bSummary )
m_bTryExtraStage = m_bTryExtraStage =
GAMESTATE->HasEarnedExtraStage() && GAMESTATE->HasEarnedExtraStage() &&
m_ResultMode==RM_ARCADE_STAGE && m_ResultMode==RM_ARCADE_STAGE;
!PREFSMAN->m_bEventMode;
// //
// Init ResultMode-specific displays // Init ResultMode-specific displays
stepmania/src/ScreenGameplay.cpp
+3 -10
View File
@@ -1246,20 +1246,14 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
if( GAMESTATE->m_SongOptions.m_FailType == SongOptions::FAIL_END_OF_SONG && AllFailedEarlier() ) if( GAMESTATE->m_SongOptions.m_FailType == SongOptions::FAIL_END_OF_SONG && AllFailedEarlier() )
{ {
this->SendScreenMessage( SM_BeginFailed, 0 ); this->SendScreenMessage( SM_BeginFailed, 0 );
return;
} }
else
{
m_StarWipe.CloseWipingRight( SM_None ); m_StarWipe.CloseWipingRight( SM_None );
// do they deserve an extra stage? // do they deserve an extra stage?
bool bTryExtraStage = GAMESTATE->HasEarnedExtraStage(); if( GAMESTATE->HasEarnedExtraStage() )
if( PREFSMAN->m_bEventMode )
bTryExtraStage = false;
if( bTryExtraStage )
{
this->SendScreenMessage( SM_ShowTryExtraStage, 1 ); this->SendScreenMessage( SM_ShowTryExtraStage, 1 );
}
else else
{ {
this->SendScreenMessage( SM_ShowCleared, 1 ); this->SendScreenMessage( SM_ShowCleared, 1 );
@@ -1267,7 +1261,6 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
} }
} }
} }
}
break; break;
case SM_BeginLoadingNextSong: case SM_BeginLoadingNextSong: