Merge branch 'master' into promises

Conflicts: emdosbox-loader.js
2026-09-14 18:43:01 +00:00 · 2015-01-28 11:31:31 -08:00
parent eefef077c0 ddb52d890c
commit db0d970dd6
1 changed files with 6 additions and 0 deletions
@@ -1249,6 +1249,12 @@ var Module = null;
                print: function (text) { console.log(text); },
                canvas: canvas,
                noInitialRun: false,
+                locateFile: function (file) {
+                              if ("file_locations" in modulecfg && file in modulecfg.file_locations) {
+                                return get_js_url(modulecfg.file_locations[file]);
+                              }
+                              throw new Error("Don't know how to find file: "+ file);
+                            },
                preInit: function () {
                           splash.loading_text = 'Loading game file(s) into file system';
                           var len = game_files.length;