allow multiple, simultaneous prepared screens

2004-12-09 09:41:06 +00:00
parent 7085d480ec
commit 12d556c759
12 changed files with 114 additions and 54 deletions
@@ -577,10 +577,15 @@ 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();
-	// XXX: handle different destinations based on play mode?
+		// XXX: handle different destinations based on play mode?
+	}
 	else
+	{
+		SCREENMAN->DeletePreparedScreens();
 		SCREENMAN->SetNewScreen( PREV_SCREEN ); // (GAMESTATE->m_PlayMode) );
+	}
 }

 void ScreenOptionsMaster::RefreshIcons()