cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-15 11:22:55 +00:00
Code Issues Releases Wiki Activity

Merge branch 'bugfix/instrumental-selector' into rewrite/master

Browse source
This commit is contained in:
Cameron Taylor 2024-09-09 23:49:02 -04:00
parent adb4bc96ca 877d64c32b
commit 030afe1355
1 changed files with 0 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
source/funkin/ui/freeplay/FreeplayState.hx
View file

@ -1985,22 +1985,6 @@ class FreeplayState extends MusicBeatSubState
return; return;
} }
var baseInstrumentalId:String = targetSong?.getBaseInstrumentalId(targetDifficultyId, targetDifficulty.variation ?? Constants.DEFAULT_VARIATION) ?? '';
var altInstrumentalIds:Array<String> = targetSong?.listAltInstrumentalIds(targetDifficultyId,
targetDifficulty.variation ?? Constants.DEFAULT_VARIATION) ?? [];
var targetInstId:String = baseInstrumentalId;
// TODO: Make this a UI element.
#if FEATURE_DEBUG_FUNCTIONS
if (altInstrumentalIds.length > 0 && FlxG.keys.pressed.CONTROL)
{
targetInstId = altInstrumentalIds[0];
}
if (targetInstId == null) targetInstId = baseInstrumentalId;
#end
// Visual and audio effects. // Visual and audio effects.
FunkinSound.playOnce(Paths.sound('confirmMenu')); FunkinSound.playOnce(Paths.sound('confirmMenu'));
if (dj != null) dj.confirm(); if (dj != null) dj.confirm();