Fix Linux and Windows build issues; texture looks in CDBs first

This commit is contained in:
2023-09-18 15:45:51 +00:00
parent c9c05d931d
commit 60d078321c
13 changed files with 54 additions and 63 deletions

View File

@@ -208,7 +208,7 @@ Object.defineProperty(String.prototype, 'ext', {
Object.defineProperty(String.prototype, 'set_ext', {
value: function(val) {
return this.name() + val;
return this.dir() + "/" + this.name() + val;
}
});

View File

@@ -1,14 +1,10 @@
var files = {};
function load(file) {
var modtime = cmd(0, file);
if (modtime === 0) {
Log.stack();
return false;
}
var modtime = cmd(0, file);
files[file] = modtime;
}
}
load("scripts/base.js");
load("scripts/std.js");
function initialize()
@@ -31,9 +27,6 @@ function run(file)
return cmd(117, file);
}
load("scripts/base.js");
load("scripts/diff.js");
Log.level = 1;
@@ -629,5 +622,3 @@ Game.view_camera(Primum.spawn(ur.camera2d));
Window.name = "Primum Machinam (V0.1)";
Window.width = 1280;
Window.height = 720;
Log.warn("AMDE IT");

View File

@@ -177,3 +177,4 @@ Cmdline.register_cmd("t", function() {
Log.warn("Testing not implemented yet.");
Game.quit();
}, "Test suite.");