set PreviousScreen during BeginScreen

This commit is contained in:
Glenn Maynard
2007-02-26 08:24:11 +00:00
parent 5637d0f7f7
commit 107c0e20c3
+7 -1
View File
@@ -103,6 +103,7 @@ namespace ScreenManagerUtil
}; };
Actor *g_pSharedBGA; // BGA object that's persistent between screens Actor *g_pSharedBGA; // BGA object that's persistent between screens
RString m_sPreviousTopScreen;
vector<LoadedScreen> g_ScreenStack; // bottommost to topmost vector<LoadedScreen> g_ScreenStack; // bottommost to topmost
vector<Screen*> g_OverlayScreens; vector<Screen*> g_OverlayScreens;
set<RString> g_setGroupedScreens; set<RString> g_setGroupedScreens;
@@ -120,10 +121,15 @@ namespace ScreenManagerUtil
/* Set the name of the loading screen. */ /* Set the name of the loading screen. */
{ {
LuaThreadVariable var( "LoadingScreen", ls.m_pScreen->GetName() ); LuaThreadVariable var1( "PreviousScreen", m_sPreviousTopScreen );
LuaThreadVariable var2( "LoadingScreen", ls.m_pScreen->GetName() );
ls.m_pScreen->BeginScreen(); ls.m_pScreen->BeginScreen();
} }
/* If this is the new top screen, save the name. */
if( g_ScreenStack.size() == 1 )
m_sPreviousTopScreen = ls.m_pScreen->GetName();
SCREENMAN->RefreshCreditsMessages(); SCREENMAN->RefreshCreditsMessages();
SCREENMAN->PostMessageToTopScreen( SM_GainFocus, 0 ); SCREENMAN->PostMessageToTopScreen( SM_GainFocus, 0 );