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

cleanup: do this like Screen

Browse Source
This commit is contained in:
Glenn Maynard
2005-06-25 08:16:30 +00:00
parent 508913f730
commit ae413ab5b6
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenOptionsMaster.cpp
+3 -5
View File
@@ -156,7 +156,7 @@ void ScreenOptionsMaster::BeginFadingOut()
void ScreenOptionsMaster::GoToNextScreen()
{
if( GAMESTATE->m_bEditing )
if( SCREENMAN->IsStackedScreen(this) )
SCREENMAN->PopTopScreen( SM_None );
else if( m_bExportWillSetANewScreen )
; // Do nothing. Let Export set the screen.
@@ -166,16 +166,14 @@ void ScreenOptionsMaster::GoToNextScreen()
void ScreenOptionsMaster::GoToPrevScreen()
{
/* XXX: A better way to handle this would be to check if we're a pushed screen. */
if( GAMESTATE->m_bEditing )
if( SCREENMAN->IsStackedScreen(this) )
{
SCREENMAN->PopTopScreen( SM_None );
// XXX: handle different destinations based on play mode?
}
else
{
SCREENMAN->DeletePreparedScreens();
SCREENMAN->SetNewScreen( PREV_SCREEN ); // (GAMESTATE->m_PlayMode) );
SCREENMAN->SetNewScreen( PREV_SCREEN );
}
}