ethanaobrien/EmulatorJS
1
0
Fork 0
mirror of https://github.com/EmulatorJS/EmulatorJS.git synced 2024-09-20 02:46:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix compressed file on non psx core bug

Browse source
This commit is contained in:
Ethan O'Brien 2023-07-21 10:44:06 -05:00
parent 6498bd8405
commit c01fb72883
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
data/emulator.js
View file

@ -173,8 +173,7 @@ class EmulatorJS {
this.ejs_num_version = 40.4;
this.debug = (window.EJS_DEBUG_XX === true);
if (this.debug || (window.location && ['localhost', '127.0.0.1'].includes(location.hostname))) this.checkForUpdates();
this.netplayEnabled = false; //DO NOT ENABLE UNLESS YOU KNOW WHAT YOU'RE DOING
if (!this.debug) this.netplayEnabled = false;
this.netplayEnabled = (window.EJS_DEBUG_XX === true) && (window.EJS_EXPERIMENTAL_NETPLAY === true);
this.config = config;
this.currentPopup = null;
this.touch = false;
@ -782,7 +781,6 @@ class EmulatorJS {
let resData = {};
const altName = this.config.gameUrl.startsWith("blob:") ? this.config.gameName || "game" : this.config.gameUrl.split('/').pop().split("#")[0].split("?")[0];
this.checkCompression(new Uint8Array(data), this.localization("Decompress Game Data"), (fileName, fileData) => {
console.log(fileName);
if (fileName.includes("/")) {
const paths = fileName.split("/");
let cp = "";
@ -800,7 +798,7 @@ class EmulatorJS {
}
if (this.getCore(true) === "psx" && ["m3u", "cue"].includes(fileName.split(".").pop().toLowerCase())) {
resData[fileName] = fileData;
} else if (this.getCore(true) === "psx" && fileName !== "!!notCompressedData") {
} else if (fileName !== "!!notCompressedData") {
resData[fileName] = true;
}
if (fileName === "!!notCompressedData") {
@ -836,7 +834,6 @@ class EmulatorJS {
this.fileName = k;
}
if (this.getCore(true) === "psx" && execFile === null && ["m3u", "cue"].includes(k.split(".").pop().toLowerCase())) {
console.log(k, resData[k]);
FS.writeFile("/"+k, resData[k]);
}
}
@ -928,9 +925,6 @@ class EmulatorJS {
if (this.debug) console.log(args);
this.Module.callMain(args);
this.Module.resumeMainLoop();
if (this.touch) {
this.virtualGamepad.style.display = "";
}
this.checkSupportedOpts();
this.setupSettingsMenu();
@ -946,6 +940,9 @@ class EmulatorJS {
this.handleResize();
this.started = true;
this.paused = false;
if (this.touch) {
this.virtualGamepad.style.display = "";
}
} catch(e) {
console.warn("failed to start game", e);
this.textElem.innerText = this.localization("Failed to start game");

2
data/emulator.min.js vendored
View file

File diff suppressed because one or more lines are too long