Merge remote-tracking branch 'origin/5_1-new' into catalina-workaround

Themes/_fallback/Scripts/03 CustomSpeedMods.lua

@@ -70,7 +70,7 @@ end
 -- Parses a speed mod and returns the pair (type, number) or nil if parsing
 -- failed.
 local function CanonicalizeMod(mod)
-	num = tonumber(mod:match("^(%d+.?%d*)[xX]$"))
+	local num = tonumber(mod:match("^(%d+.?%d*)[xX]$"))
 	if num ~= nil then
 		return "x", num
 	end

Themes/default/Scripts/03 Gameplay.lua

@@ -12,11 +12,11 @@ local tNotePositions = {
 }
 
 function GetTapPosition( sType )
-	bCategory = (sType == 'Standard') and 1 or 2
+	local  bCategory = (sType == 'Standard') and 1 or 2
 	-- true: Normal
 	-- false: Lower
-	bPreference = ThemePrefs.Get("NotePosition") and "Normal" or "Lower"
-	tNotePos = tNotePositions[bPreference]
+	local bPreference = ThemePrefs.Get("NotePosition") and "Normal" or "Lower"
+	local tNotePos = tNotePositions[bPreference]
 	return tNotePos[bCategory]
 end
 
@@ -74,13 +74,13 @@ end
 function ScreenSelectStylePositions(count)
 	local poses= {}
 	local choice_size = 192
-	
+
 	for i= 1, count do
 		local start_x = _screen.cx + ( (choice_size / 1.5) * ( i - math.ceil(count/2) ) )
 		-- The Y position depends on if the icon's index is even or odd.
 		local start_y = i % 2 == 0 and _screen.cy / 0.8 or (_screen.cy / 0.8) - (choice_size / 1.5)
 		poses[#poses+1] = {start_x, start_y}
 	end
-	
+
 	return poses
 end

Themes/legacy/Scripts/03 Gameplay.lua

@@ -12,11 +12,11 @@ local tNotePositions = {
 }
 
 function GetTapPosition( sType )
-	bCategory = (sType == 'Standard') and 1 or 2
+	local bCategory = (sType == 'Standard') and 1 or 2
 	-- true: Normal
 	-- false: Lower
-	bPreference = ThemePrefs.Get("NotePosition") and "Normal" or "Lower"
-	tNotePos = tNotePositions[bPreference]
+	local bPreference = ThemePrefs.Get("NotePosition") and "Normal" or "Lower"
+	local tNotePos = tNotePositions[bPreference]
 	return tNotePos[bCategory]
 end
 

src/PrefsManager.cpp

@@ -275,7 +275,7 @@ PrefsManager::PrefsManager() :
 	m_iSoundDevice			( "SoundDevice",			"" ),
 	m_iRageSoundSampleCountClamp	("RageSoundSampleCountClamp", 0), //some sound drivers mask the sample location number, the most popular number for this is 2^27, this causes lockup after ~50 minutes at 44.1khz sample rate
 	m_iSoundPreferredSampleRate	( "SoundPreferredSampleRate",		0 ),
-	m_sLightsStepsDifficulty	( "LightsStepsDifficulty",		"medium" ),
+	m_sLightsStepsDifficulty	( "LightsStepsDifficulty",		"hard,medium" ),
 	m_bAllowUnacceleratedRenderer	( "AllowUnacceleratedRenderer",		false ), 
 	m_bThreadedInput		( "ThreadedInput",			true ),
 	m_bThreadedMovieDecode		( "ThreadedMovieDecode",		true ),

src/ScreenGameplay.cpp

@@ -1452,6 +1452,27 @@ void ScreenGameplay::LoadLights()
 	NoteData TapNoteData1;
 	pSteps->GetNoteData( TapNoteData1 );
 
+	//taken from oitg, restores arrow -> marquee/bass light mapping.
+	if( asDifficulties.size() > 1 )
+	{
+		Difficulty d2 = StringToDifficulty( asDifficulties[1] );
+
+		Steps *pSteps2;
+
+		pSteps2 = SongUtil::GetClosestNotes( GAMESTATE->m_pCurSong, st, d2 );
+
+		if(pSteps2 != nullptr)
+		{
+			NoteData TapNoteData2;
+			pSteps2->GetNoteData( TapNoteData2 );
+
+			NoteDataUtil::LoadTransformedLightsFromTwo( TapNoteData1, TapNoteData2, m_CabinetLightsNoteData );
+			return;
+		}
+
+		/* fall through */
+	}
+
 	NoteDataUtil::LoadTransformedLights( TapNoteData1, m_CabinetLightsNoteData, GAMEMAN->GetStepsTypeInfo(StepsType_lights_cabinet).iNumTracks );
 }