fix Pop message doesn't get sent if more than 1 prompt screen on the stack

This commit is contained in:
Chris Danford
2005-03-23 06:46:24 +00:00
parent 7c6ed89975
commit 659def4479
17 changed files with 53 additions and 50 deletions
+2 -2
View File
@@ -145,7 +145,7 @@ void ScreenOptionsMaster::BeginFadingOut()
void ScreenOptionsMaster::GoToNextScreen()
{
if( GAMESTATE->m_bEditing )
SCREENMAN->PopTopScreen();
SCREENMAN->PopTopScreen( SM_None );
else if( m_sExportedNextScreen != "" )
SCREENMAN->SetNewScreen( m_sExportedNextScreen );
else if( NEXT_SCREEN != "" )
@@ -157,7 +157,7 @@ void ScreenOptionsMaster::GoToPrevScreen()
/* XXX: A better way to handle this would be to check if we're a pushed screen. */
if( GAMESTATE->m_bEditing )
{
SCREENMAN->PopTopScreen();
SCREENMAN->PopTopScreen( SM_None );
// XXX: handle different destinations based on play mode?
}
else