split out ScreenGameplay::LoadLights

stepmania/src/ScreenGameplay.cpp

@@ -1081,8 +1081,19 @@ void ScreenGameplay::LoadNextSong()
 	//
 	// Load cabinet lights data
 	//
-	if( LIGHTSMAN->IsEnabled() )
+	LoadLights();
-	{
+
+	/* Load the music last, since it may start streaming and we don't want the music
+	 * to compete with other loading. */
+	m_AutoKeysounds.FinishLoading();
+	m_pSoundMusic = m_AutoKeysounds.GetSound();
+}
+
+void ScreenGameplay::LoadLights()
+{
+	if( !LIGHTSMAN->IsEnabled() )
+		return;
+
 	m_CabinetLightsNoteData.Init();
 	ASSERT( GAMESTATE->m_pCurSong );
 
@@ -1101,12 +1112,6 @@ void ScreenGameplay::LoadNextSong()
 			NoteDataUtil::LoadTransformedLights( TapNoteData, m_CabinetLightsNoteData, GameManager::StepsTypeToNumTracks(STEPS_TYPE_LIGHTS_CABINET) );
 		}
 	}
-	}
-
-	/* Load the music last, since it may start streaming and we don't want the music
-	 * to compete with other loading. */
-	m_AutoKeysounds.FinishLoading();
-	m_pSoundMusic = m_AutoKeysounds.GetSound();
 }
 
 float ScreenGameplay::StartPlayingSong(float MinTimeToNotes, float MinTimeToMusic)

stepmania/src/ScreenGameplay.h

@@ -64,6 +64,7 @@ protected:
 	void LoadNextSong();
 	void LoadCourseSongNumber( int SongNumber );
 	float StartPlayingSong(float MinTimeToNotes, float MinTimeToMusic);
+	void LoadLights();
 	void PauseGame( bool bPause, GameController gc = GAME_CONTROLLER_INVALID );
 	void ShowSavePrompt( ScreenMessage SM_SendWhenDone );
 	void PlayAnnouncer( CString type, float fSeconds );