diff --git a/buildnumber.txt b/buildnumber.txt index 3d32f7d2..efa4e313 100644 --- a/buildnumber.txt +++ b/buildnumber.txt @@ -1 +1 @@ -1281 \ No newline at end of file +1283 \ No newline at end of file diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index 1a69f284..641e9730 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -285,11 +285,14 @@ class PlayState extends MusicBeatState // case "": // ADD YOUR HARDCODED SCRIPTS HERE! default: - var content = Paths.getFolderContent('data/charts/${SONG.song}/', false, true, !fromMods); - for(file in content) { - var ext = Path.extension(file).toLowerCase(); - if (Script.scriptExtensions.contains(ext)) { - scripts.add(Script.create(file)); + for(content in [ + Paths.getFolderContent('data/charts/${SONG.song}/', false, true, !fromMods), + Paths.getFolderContent('data/charts/', false, true, !fromMods)]) { + for(file in content) { + var ext = Path.extension(file).toLowerCase(); + if (Script.scriptExtensions.contains(ext)) { + scripts.add(Script.create(file)); + } } } } diff --git a/source/native/WinAPI.hx b/source/native/WinAPI.hx index 33ee9878..df3d151d 100644 --- a/source/native/WinAPI.hx +++ b/source/native/WinAPI.hx @@ -104,7 +104,6 @@ class AudioFixClient : public IMMNotificationClient { EDataFlow flow, ERole role, LPCWSTR pwstrDeviceId) { - std::cout << "fuck"; ::funkin::_hx_system::Main_obj::audioDisconnected = true; return S_OK; };