From 014dcf7ccda9c1d2353920e43e4ee33c0f5be49e Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 18 Mar 2005 02:57:03 +0000 Subject: [PATCH] load assets before the song --- stepmania/src/ScreenGameplay.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 9fe524b193..3c30f55b59 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -681,15 +681,6 @@ void ScreenGameplay::Init() } } - - /* LoadNextSong first, since that positions some elements which need to be - * positioned before we TweenOnScreen. */ - LoadNextSong(); - - TweenOnScreen(); - - this->SortByDrawOrder(); - if( !GAMESTATE->m_bDemonstrationOrJukebox ) // only load if we're going to use it { m_soundAssistTick.Load( THEME->GetPathS(m_sName,"assist tick"), true ); @@ -704,6 +695,15 @@ void ScreenGameplay::Init() } } + + /* LoadNextSong first, since that positions some elements which need to be + * positioned before we TweenOnScreen. */ + LoadNextSong(); + + TweenOnScreen(); + + this->SortByDrawOrder(); + m_GiveUpTimer.SetZero(); // Get the transitions rolling on the first update.