idk what about this

JoaTH-Team · Sep 19, 2024 · ebeabf9 · ebeabf9
1 parent a9c32b4
commit ebeabf9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/source/game/Hscript.hx b/source/game/Hscript.hx
@@ -130,10 +130,7 @@ class Hscript extends FlxBasic {
 
 	public function execute(file:String, ?executeCreate:Bool = true):Void {
 		try {
-			if (Assets.exists(file, TEXT))
-				interp.execute(parser.parseString(Assets.getText(file)));
-			else
-				throw 'script $file doesn\'t exist!';
+			interp.execute(parser.parseString(file));
 		} catch (e:Dynamic)
 			Lib.application.window.alert(e, 'Hscript Error!');
 

diff --git a/source/states/PlayState.hx b/source/states/PlayState.hx
@@ -105,10 +105,10 @@ class PlayState extends ExtendableState {
 			foldersToCheck.push('mods/' + mod + '/scripts/');
 		#end
 		for (folder in foldersToCheck) {
-			if (FileSystem.exists(folder)) {
+			if (FileSystem.exists(folder) && FileSystem.isDirectory(folder)) {
 				for (file in FileSystem.readDirectory(folder)) {
 					if (file.endsWith('.hxs')) {
-						scriptArray.push(new Hscript(folder + file));
+						scriptArray.push(new Hscript(File.getContent(folder + file)));
 					}
 				}
 			}
@@ -173,10 +173,10 @@ class PlayState extends ExtendableState {
 			foldersToCheck.push('mods/' + mod + '/songs/' + Paths.formatToSongPath(song.song) + '/');
 		#end
 		for (folder in foldersToCheck) {
-			if (FileSystem.exists(folder)) {
+			if (FileSystem.exists(folder) && FileSystem.isDirectory(folder)) {
 				for (file in FileSystem.readDirectory(folder)) {
 					if (file.endsWith('.hxs')) {
-						scriptArray.push(new Hscript(folder + file));
+						scriptArray.push(new Hscript(File.getContent(folder + file)));
 					}
 				}
 			}