Skip to content

Commit ee2f3c3

Browse files
VioletSnowLeopardmoondroidcoder
authored andcommitted
Fixes for the recent update
1 parent 0f99a1c commit ee2f3c3

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

source/funkin/ui/freeplay/FreeplayState.hx

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2437,8 +2437,10 @@ class FreeplayState extends MusicBeatSubState
24372437
return;
24382438
}
24392439

2440-
busy = true;
2440+
controls.active = false;
2441+
#if NO_FEATURE_TOUCH_CONTROLS
24412442
letterSort.inputEnabled = false;
2443+
#end
24422444
var instrumentalChoices:Array<String> = ['default', 'random'];
24432445

24442446
capsuleOptionsMenu = new CapsuleOptionsMenu(this, randomCapsule.targetPos.x + 175, randomCapsule.targetPos.y + 115, instrumentalChoices);
@@ -2457,8 +2459,10 @@ class FreeplayState extends MusicBeatSubState
24572459
function capsuleOnConfirmRandom(availableSongCapsules:Array<SongMenuItem>, instChoice:String):Void
24582460
{
24592461
cleanupCapsuleOptionsMenu();
2460-
busy = true;
2462+
controls.active = false;
2463+
#if NO_FEATURE_TOUCH_CONTROLS
24612464
letterSort.inputEnabled = false;
2465+
#end
24622466

24632467
var targetSongCap:SongMenuItem = FlxG.random.getObject(availableSongCapsules);
24642468
// Seeing if I can do an animation...
@@ -2470,8 +2474,10 @@ class FreeplayState extends MusicBeatSubState
24702474
if (targetSongNullable == null)
24712475
{
24722476
FlxG.log.warn('WARN: could not find song with id (${targetSongId})');
2473-
busy = false;
2477+
controls.active = true;
2478+
#if NO_FEATURE_TOUCH_CONTROLS
24742479
letterSort.inputEnabled = true;
2480+
#end
24752481
return;
24762482
}
24772483
var targetSong:Song = targetSongNullable;
@@ -2482,19 +2488,13 @@ class FreeplayState extends MusicBeatSubState
24822488
if (targetDifficulty == null)
24832489
{
24842490
FlxG.log.warn('WARN: could not find difficulty with id (${targetDifficultyId})');
2485-
busy = false;
2491+
controls.active = true;
2492+
#if NO_FEATURE_TOUCH_CONTROLS
24862493
letterSort.inputEnabled = true;
2494+
#end
24872495
return;
24882496
}
24892497

2490-
// Seeing if I can do an animation...
2491-
curSelected = grpCapsules.members.indexOf(targetSongCap);
2492-
changeSelection(0); // Trigger an update.
2493-
controls.active = false;
2494-
#if NO_FEATURE_TOUCH_CONTROLS
2495-
letterSort.inputEnabled = false;
2496-
#end
2497-
24982498
if (instChoice == 'random')
24992499
{
25002500
var baseInstrumentalId:String = targetSong.getBaseInstrumentalId(targetDifficultyId, targetDifficulty?.variation ?? Constants.DEFAULT_VARIATION) ?? '';

0 commit comments

Comments
 (0)