fixed it yay

also uhhhhh
JoaTH-Team · Sep 19, 2024 · 3677e75 · 3677e75
1 parent ebeabf9
commit 3677e75
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/source/game/Hscript.hx b/source/game/Hscript.hx
@@ -130,7 +130,7 @@ class Hscript extends FlxBasic {
 
 	public function execute(file:String, ?executeCreate:Bool = true):Void {
 		try {
-			interp.execute(parser.parseString(file));
+			interp.execute(parser.parseString(File.getContent(file)));
 		} catch (e:Dynamic)
 			Lib.application.window.alert(e, 'Hscript Error!');
 

diff --git a/source/game/NoteSplash.hx b/source/game/NoteSplash.hx
@@ -16,8 +16,10 @@ class NoteSplash extends GameSprite {
 		if (visible && alpha > 0) {
 			FlxTween.tween(this, {alpha: 0}, 0.33, {
 				onComplete: (twn:FlxTween) -> {
-					if (alpha <= 0)
+					if (alpha <= 0) {
 						visible = false;
+						kill();
+					}
 				}
 			});
 		}

diff --git a/source/states/PlayState.hx b/source/states/PlayState.hx
@@ -108,7 +108,7 @@ class PlayState extends ExtendableState {
 			if (FileSystem.exists(folder) && FileSystem.isDirectory(folder)) {
 				for (file in FileSystem.readDirectory(folder)) {
 					if (file.endsWith('.hxs')) {
-						scriptArray.push(new Hscript(File.getContent(folder + file)));
+						scriptArray.push(new Hscript(folder + file));
 					}
 				}
 			}
@@ -176,7 +176,7 @@ class PlayState extends ExtendableState {
 			if (FileSystem.exists(folder) && FileSystem.isDirectory(folder)) {
 				for (file in FileSystem.readDirectory(folder)) {
 					if (file.endsWith('.hxs')) {
-						scriptArray.push(new Hscript(File.getContent(folder + file)));
+						scriptArray.push(new Hscript(folder + file));
 					}
 				}
 			}

diff --git a/source/states/TitleState.hx b/source/states/TitleState.hx
@@ -11,8 +11,8 @@ class TitleState extends ExtendableState {
 
 		#if FUTURE_POLYMOD
 		if (ModHandler.trackedMods != []) {
-			for (i in ModHandler.trackedMods)
-				Main.toast.create('Mods Installed:', 0xFFFFFF00, i.title);
+			var installedMods:Array<String> = ModHandler.getMods();
+			Main.toast.create('Mods Installed:', 0xFFFFFF00, installedMods.join('\n'));
 		}
 		#end