From 481bb0526acb2faedf26f59fcdefefafea68ed19 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 18 Jan 2006 20:33:17 +0000 Subject: [PATCH] simplify --- stepmania/src/ScreenGameplay.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 78c9b0fa3d..d62fd92492 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -747,6 +747,7 @@ void ScreenGameplay::Init() m_textDebug.SetDrawOrder( DRAW_ORDER_TRANSITIONS-1 ); // just under transitions, over the foreground this->AddChild( &m_textDebug ); + m_soundAssistTick.Load( THEME->GetPathS(m_sName,"assist tick"), true ); if( GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2() ) // only load if we're going to use it { @@ -759,13 +760,6 @@ void ScreenGameplay::Init() this->AddChild( &m_textSurviveTime ); } - m_soundAssistTick.Load( THEME->GetPathS(m_sName,"assist tick"), true ); - } - - m_SongBackground.Init(); - - if( !GAMESTATE->m_bDemonstrationOrJukebox ) // only load if we're going to use it - { switch( GAMESTATE->m_PlayMode ) { case PLAY_MODE_BATTLE: @@ -776,6 +770,8 @@ void ScreenGameplay::Init() } } + m_SongBackground.Init(); + FOREACH_EnabledPlayerInfo( m_vPlayerInfo, pi ) { pi->m_pPlayer->Init(