Skip to content

Commit bf3c45d

Browse files
committed
Re-enable streamed music in this branch
1 parent 2591230 commit bf3c45d

2 files changed

Lines changed: 4 additions & 11 deletions

File tree

source/funkin/options/Options.hx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ class Options
4343
public static var framerate:Int = 120;
4444
public static var gpuOnlyBitmaps:Bool = #if (mac || web) false #else true #end; // causes issues on mac and web
4545
public static var language = "en"; // default to english, Flags.DEFAULT_LANGUAGE should not modify this
46-
public static var streamedMusic:Bool = false;
47-
public static var streamedVocals:Bool = false;
46+
public static var streamedMusic:Bool = true;
47+
public static var streamedVocals:Bool = true;
4848
public static var quality:Int = 1;
4949
public static var allowConfigWarning:Bool = true;
5050
#if MODCHARTING_FEATURES

source/funkin/options/categories/GameplayOptions.hx

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,7 @@ class AdvancedGameplayOptions extends TreeMenuScreen {
6767
public function new() {
6868
super('optionsMenu.advanced', 'optionsTree.gameplay.advanced-desc', 'GameplayOptions.Advanced.');
6969

70-
// Remove locked whenever this PR from FunkinCrew is merged.
71-
// https://github.com/FunkinCrew/lime/pull/57
72-
for (checkbox in [
73-
new Checkbox(getNameID('streamedMusic'), getDescID('streamedMusic'), 'streamedMusic'),
74-
new Checkbox(getNameID('streamedVocals'), getDescID('streamedVocals'), 'streamedVocals')
75-
]) {
76-
checkbox.locked = true;
77-
add(checkbox);
78-
}
70+
add(new Checkbox(getNameID('streamedMusic'), getDescID('streamedMusic'), 'streamedMusic'));
71+
add(new Checkbox(getNameID('streamedVocals'), getDescID('streamedVocals'), 'streamedVocals'));
7972
}
8073
}

0 commit comments

Comments
 (0)