mirror of
https://github.com/RandomityGuy/MBHaxe.git
synced 2026-04-27 05:01:38 +00:00
few fixes
This commit is contained in:
parent
928e95af6e
commit
5b502cd9b2
2 changed files with 14 additions and 4 deletions
|
|
@ -47,13 +47,11 @@ class Http {
|
||||||
responses.add(() -> req.callback(b));
|
responses.add(() -> req.callback(b));
|
||||||
req.fulfilled = true;
|
req.fulfilled = true;
|
||||||
};
|
};
|
||||||
#if !MACOS_BUNDLE
|
hl.Gc.enable(false);
|
||||||
hl.Gc.blocking(true); // Wtf is this shit
|
hl.Gc.blocking(true); // Wtf is this shit
|
||||||
#end
|
|
||||||
http.request(false);
|
http.request(false);
|
||||||
#if !MACOS_BUNDLE
|
|
||||||
hl.Gc.blocking(false);
|
hl.Gc.blocking(false);
|
||||||
#end
|
hl.Gc.enable(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#end
|
#end
|
||||||
|
|
|
||||||
|
|
@ -150,18 +150,30 @@ class Mission {
|
||||||
var basename = haxe.io.Path.withoutExtension(this.path);
|
var basename = haxe.io.Path.withoutExtension(this.path);
|
||||||
if (ResourceLoader.fileSystem.exists(basename + ".png")) {
|
if (ResourceLoader.fileSystem.exists(basename + ".png")) {
|
||||||
imgFileEntry = ResourceLoader.fileSystem.get(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(() -> {
|
imgFileEntry.load(() -> {
|
||||||
var ret = ResourceLoader.getResource(basename + ".png", ResourceLoader.getImage, this.imageResources).toTile();
|
var ret = ResourceLoader.getResource(basename + ".png", ResourceLoader.getImage, this.imageResources).toTile();
|
||||||
onLoaded(ret);
|
onLoaded(ret);
|
||||||
});
|
});
|
||||||
|
#end
|
||||||
return imgFileEntry.path;
|
return imgFileEntry.path;
|
||||||
}
|
}
|
||||||
if (ResourceLoader.fileSystem.exists(basename + ".jpg")) {
|
if (ResourceLoader.fileSystem.exists(basename + ".jpg")) {
|
||||||
imgFileEntry = ResourceLoader.fileSystem.get(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(() -> {
|
imgFileEntry.load(() -> {
|
||||||
var ret = ResourceLoader.getResource(basename + ".jpg", ResourceLoader.getImage, this.imageResources).toTile();
|
var ret = ResourceLoader.getResource(basename + ".jpg", ResourceLoader.getImage, this.imageResources).toTile();
|
||||||
onLoaded(ret);
|
onLoaded(ret);
|
||||||
});
|
});
|
||||||
|
#end
|
||||||
return imgFileEntry.path;
|
return imgFileEntry.path;
|
||||||
}
|
}
|
||||||
Console.error("Preview image not found for " + this.path);
|
Console.error("Preview image not found for " + this.path);
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue