From ae413ab5b6a0a454ae1948d1f67e84f535428c57 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 25 Jun 2005 08:16:30 +0000 Subject: [PATCH] cleanup: do this like Screen --- stepmania/src/ScreenOptionsMaster.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/stepmania/src/ScreenOptionsMaster.cpp b/stepmania/src/ScreenOptionsMaster.cpp index 07db7eaf44..d1b9f0631a 100644 --- a/stepmania/src/ScreenOptionsMaster.cpp +++ b/stepmania/src/ScreenOptionsMaster.cpp @@ -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 ); } }