maxmustermann/armory
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Handle missing config

Browse source
This commit is contained in:
luboslenco 2019-03-06 21:54:05 +01:00
parent dc1fa59733
commit 5641923ec5
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Sources/armory/data/Config.hx
View file

@ -3,12 +3,17 @@ package armory.data;
class Config {
public static var raw:TConfig = null;
public static var configLoaded = false;
public static function load(done:Void->Void) {
iron.data.Data.getBlob('config.arm', function(blob:kha.Blob) {
raw = haxe.Json.parse(blob.toString());
done();
});
try {
iron.data.Data.getBlob('config.arm', function(blob:kha.Blob) {
configLoaded = true;
raw = haxe.Json.parse(blob.toString());
done();
});
}
catch(e:Dynamic) { done(); }
}
public static function save() {

1
Sources/armory/system/Starter.hx
View file

@ -25,6 +25,7 @@ class Starter {
if (c.window_maximizable == null) c.window_maximizable = max;
if (c.window_w == null) c.window_w = w;
if (c.window_h == null) c.window_h = h;
if (c.window_scale == null) c.window_scale = 1.0;
if (c.window_msaa == null) c.window_msaa = msaa;
if (c.window_vsync == null) c.window_vsync = vsync;