mirror of
https://github.com/db48x/emularity.git
synced 2026-09-14 10:32:37 +00:00
move config to the correct place
code documentation should describe the difference better (or perhaps should explain it in the first place)
This commit is contained in:
@@ -62,8 +62,7 @@ var Module = null;
|
||||
emulator = new Emulator(canvas).setScale(scale)
|
||||
.setSplashImage(images.ia)
|
||||
.setLoad(loadFiles)
|
||||
.setCallbacks(callbacks)
|
||||
.setFileSystemName(game);
|
||||
.setCallbacks(callbacks);
|
||||
|
||||
var cfgr;
|
||||
function loadFiles(fetch_file, splash) {
|
||||
@@ -115,6 +114,7 @@ var Module = null;
|
||||
var nr = modulecfg['native_resolution'];
|
||||
config_args = [cfgr.emulatorJS(get_js_url(modulecfg.js_filename)),
|
||||
cfgr.locateAdditionalEmulatorJS(locateAdditionalJS),
|
||||
cfgr.fileSystemKey(game),
|
||||
cfgr.nativeResolution(nr[0], nr[1]),
|
||||
cfgr.aspectRatio(nr[0] / nr[1]),
|
||||
cfgr.sampleRate(SAMPLE_RATE),
|
||||
@@ -295,6 +295,10 @@ var Module = null;
|
||||
return { locateAdditionalJS: func };
|
||||
};
|
||||
|
||||
BaseLoader.fileSystemKey = function (key) {
|
||||
return { fileSystemKey: key };
|
||||
};
|
||||
|
||||
BaseLoader.nativeResolution = function (width, height) {
|
||||
if (typeof width !== 'number' || typeof height !== 'number')
|
||||
throw new Error("Width and height must be numbers");
|
||||
@@ -484,7 +488,6 @@ var Module = null;
|
||||
colors: defaultSplashColors,
|
||||
table: null,
|
||||
splashimg: new Image() };
|
||||
var fileSystemName = "emularity";
|
||||
|
||||
var SDL_PauseAudio;
|
||||
this.mute = function (state) {
|
||||
@@ -557,11 +560,6 @@ var Module = null;
|
||||
loadFiles = loadFunc;
|
||||
return this;
|
||||
};
|
||||
|
||||
this.setFileSystemName = function(name) {
|
||||
fileSystemName = name;
|
||||
return this;
|
||||
};
|
||||
|
||||
var start = function (options) {
|
||||
if (has_started)
|
||||
|
||||
Reference in New Issue
Block a user