use throw in failed chart load crash

MaybeMaru · Dec 11, 2023 · a683a10 · a683a10
1 parent 4bdb2bf
commit a683a10
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/assets/preload/sounds/volume.mp3 b/assets/preload/sounds/volume.mp3
diff --git a/source/FlxFunkGame.hx b/source/FlxFunkGame.hx
@@ -71,9 +71,13 @@ class FlxFunkSoundTray extends FlxSoundTray {
 
     override function show(up:Bool = false) {
         if (!silent) {
-			final sound = FlxAssets.getSound("assets/sounds/volume");
+            #if desktop
+            final sound = FlxAssets.getSound("assets/sounds/volume");
 			if (sound != null)
 				FlxG.sound.load(sound).play();
+            #else
+            CoolUtil.playSound("volume");
+            #end
 		}
 
 		_timer = 4;

diff --git a/source/funkin/util/Paths.hx b/source/funkin/util/Paths.hx
@@ -177,8 +177,11 @@ class Paths
 	}
 
 	inline static public function exists(file:String, type:AssetType):Bool {
-		#if desktop return FileSystem.exists(removeAssetLib(file));
-		#else		return OpenFlAssets.exists(file, type);			#end
+		#if desktop
+		return FileSystem.exists(removeAssetLib(file));
+		#else
+		return OpenFlAssets.exists(file, type);
+		#end
 	}
 
 	inline static public function removeAssetLib(path:String):String {

diff --git a/source/funkin/util/song/Song.hx b/source/funkin/util/song/Song.hx
@@ -79,7 +79,8 @@ class Song {
 			}
 		}
 		trace('$folder-$diff CHART NOT FOUND');
-		return loadFromFile('hard','tutorial');
+		if (folder == "tutorial" && diff == "hard") throw 'Failed to load chart'; // Couldnt even find tutorial
+		else return loadFromFile('hard','tutorial');
 	}
 
 	inline public static function getSongMeta(song:String):Null<SongMeta> {