From 3a63f5b7ef38d088acd7c51581767d9a16bb74c4 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 14 Jan 2006 05:32:54 +0000 Subject: [PATCH] as well as during load, set LoadingScreen during BeginScreen. Scripts can already use GetTopScreen to get this. However, that function also returns data that may not be what's wanted. For example, commands can be run on screens that aren't on top (eg. via broadcasts). So, using GetTopScreen as a fallback for LoadingScreen may cause latent bugs; screens should behave properly even when they're not on top, even if they're using queued broadcasts to kick off animations, etc. --- stepmania/src/ScreenManager.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/stepmania/src/ScreenManager.cpp b/stepmania/src/ScreenManager.cpp index 59f1e538b0..cc3db224c9 100644 --- a/stepmania/src/ScreenManager.cpp +++ b/stepmania/src/ScreenManager.cpp @@ -121,8 +121,13 @@ namespace // Be sure to push the screen first, so GetTopScreen returns the screen // during BeginScreen. g_ScreenStack.push_back( ls ); + + /* Set the name of the loading screen. */ + ActorUtil::ActorParam LoadingScreen( "LoadingScreen", ls.m_pScreen->GetName() ); ls.m_pScreen->BeginScreen(); + LoadingScreen.Release(); + SCREENMAN->RefreshCreditsMessages(); SCREENMAN->PostMessageToTopScreen( SM_GainFocus, 0 );