diff --git a/src/Http.hx b/src/Http.hx index d33cdd3b..992fdf04 100644 --- a/src/Http.hx +++ b/src/Http.hx @@ -47,13 +47,11 @@ class Http { responses.add(() -> req.callback(b)); req.fulfilled = true; }; - #if !MACOS_BUNDLE + hl.Gc.enable(false); hl.Gc.blocking(true); // Wtf is this shit - #end http.request(false); - #if !MACOS_BUNDLE hl.Gc.blocking(false); - #end + hl.Gc.enable(true); } } #end diff --git a/src/Mission.hx b/src/Mission.hx index 7d7871f1..aac0155e 100644 --- a/src/Mission.hx +++ b/src/Mission.hx @@ -150,18 +150,30 @@ class Mission { var basename = haxe.io.Path.withoutExtension(this.path); if (ResourceLoader.fileSystem.exists(basename + ".png")) { imgFileEntry = ResourceLoader.fileSystem.get(basename + ".png"); + #if hl + var ret = ResourceLoader.getResource(basename + ".png", ResourceLoader.getImage, this.imageResources).toTile(); + onLoaded(ret); + #end + #if js imgFileEntry.load(() -> { var ret = ResourceLoader.getResource(basename + ".png", ResourceLoader.getImage, this.imageResources).toTile(); onLoaded(ret); }); + #end return imgFileEntry.path; } if (ResourceLoader.fileSystem.exists(basename + ".jpg")) { imgFileEntry = ResourceLoader.fileSystem.get(basename + ".jpg"); + #if hl + var ret = ResourceLoader.getResource(basename + ".jpg", ResourceLoader.getImage, this.imageResources).toTile(); + onLoaded(ret); + #end + #if js imgFileEntry.load(() -> { var ret = ResourceLoader.getResource(basename + ".jpg", ResourceLoader.getImage, this.imageResources).toTile(); onLoaded(ret); }); + #end return imgFileEntry.path; } Console.error("Preview image not found for " + this.path);