mirror of
https://github.com/ninjamuffin99/Funkin.git
synced 2024-12-23 13:48:23 +00:00
Merge branch 'bugfix/instrumental-selector' into rewrite/master
This commit is contained in:
commit
030afe1355
|
@ -1985,22 +1985,6 @@ class FreeplayState extends MusicBeatSubState
|
|||
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.
|
||||
FunkinSound.playOnce(Paths.sound('confirmMenu'));
|
||||
if (dj != null) dj.confirm();
|
||||
|
|
Loading…
Reference in a new issue