From 2a1114f8d91c57d383eb2242906bb972405514cb Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Wed, 4 May 2005 08:20:12 +0000
Subject: [PATCH] use NoteDataUtil::LoadTransformedLightsFromTwo

---
 stepmania/src/ScreenGameplay.cpp | 46 ++++++++++++++++++++++++++------
 1 file changed, 38 insertions(+), 8 deletions(-)

diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index 7a1817a472..10cbb6018d 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -1097,20 +1097,50 @@ void ScreenGameplay::LoadLights()
 	m_CabinetLightsNoteData.Init();
 	ASSERT( GAMESTATE->m_pCurSong );
 
-	const Steps *pSteps = GAMESTATE->m_pCurSong->GetClosestNotes( STEPS_TYPE_LIGHTS_CABINET, StringToDifficulty(PREFSMAN->m_sLightsStepsDifficulty) );
+	const Steps *pSteps = GAMESTATE->m_pCurSong->GetClosestNotes( STEPS_TYPE_LIGHTS_CABINET, DIFFICULTY_MEDIUM );
 	if( pSteps != NULL )
 	{
 		pSteps->GetNoteData( m_CabinetLightsNoteData );
 		return;
 	}
 
-	pSteps = GAMESTATE->m_pCurSong->GetClosestNotes( GAMESTATE->GetCurrentStyle()->m_StepsType, StringToDifficulty(PREFSMAN->m_sLightsStepsDifficulty) );
-	if( pSteps )
- 	{
-		NoteData TapNoteData;
-		pSteps->GetNoteData( TapNoteData );
-		NoteDataUtil::LoadTransformedLights( TapNoteData, m_CabinetLightsNoteData, GameManager::StepsTypeToNumTracks(STEPS_TYPE_LIGHTS_CABINET) );
- 	}
+	CString sDifficulty = PREFSMAN->m_sLightsStepsDifficulty;
+	vector<CString> asDifficulties;
+	split( sDifficulty, ",", asDifficulties );
+
+	LOG->Trace( "xxx %i", asDifficulties.size() );
+	Difficulty d1 = DIFFICULTY_INVALID;
+	if( asDifficulties.size() > 0 )
+	{
+		d1 = StringToDifficulty( asDifficulties[0] );
+		LOG->Trace( "d1 %i", d1 );
+	}
+	pSteps = GAMESTATE->m_pCurSong->GetClosestNotes( GAMESTATE->GetCurrentStyle()->m_StepsType, d1 );
+
+	// If we can't find anything at all, stop.
+	if( pSteps == NULL )
+		return;
+
+	NoteData TapNoteData1;
+	pSteps->GetNoteData( TapNoteData1 );
+
+	if( asDifficulties.size() > 1 )
+	{
+		Difficulty d2 = StringToDifficulty( asDifficulties[1] );
+		LOG->Trace( "d2 %i", d2 );
+		const Steps *pSteps2 = GAMESTATE->m_pCurSong->GetClosestNotes( GAMESTATE->GetCurrentStyle()->m_StepsType, d2 );
+		if( pSteps != NULL && pSteps2 != NULL && pSteps != pSteps2 )
+		{
+			NoteData TapNoteData2;
+			pSteps2->GetNoteData( TapNoteData2 );
+			NoteDataUtil::LoadTransformedLightsFromTwo( TapNoteData1, TapNoteData2, m_CabinetLightsNoteData );
+			return;
+		}
+
+		/* fall through */
+	}
+
+	NoteDataUtil::LoadTransformedLights( TapNoteData1, m_CabinetLightsNoteData, GameManager::StepsTypeToNumTracks(STEPS_TYPE_LIGHTS_CABINET) );
 }
 
 float ScreenGameplay::StartPlayingSong(float MinTimeToNotes, float MinTimeToMusic)