load assets before the song

This commit is contained in:
Glenn Maynard
2005-03-18 02:57:03 +00:00
parent b788cc3aa8
commit 014dcf7ccd
+9 -9
View File
@@ -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.