ethanaobrien/EmulatorJS
1
0
Fork 0
mirror of https://github.com/EmulatorJS/EmulatorJS.git synced 2024-09-19 18:36:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

"fix" picodrive core

Browse source
This commit is contained in:
Ethan O'Brien 2023-08-04 11:52:11 -05:00
parent 14ca83ddce
commit 764262f348
3 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
data/GameManager.js
View file

@ -165,11 +165,18 @@ class EJS_GameManager {
}
this.functions.simulateInput(player, index, value);
}
getFileNames() {
if (this.EJS.getCore() === "picodrive") {
return ["bin", "gen", "smd", "md", "32x", "cue", "iso", "sms", "68k", "chd"];
} else {
return ["toc", "ccd", "exe", "pbp", "chd", "img", "bin", "iso"];
}
}
createCueFile(fileNames) {
try {
if (fileNames.length > 1) {
fileNames = fileNames.filter((item) => {
return ["toc", "ccd", "exe", "pbp", "chd", "img", "bin", "iso"].includes(item.split(".").pop().toLowerCase());
return this.getFileNames().includes(item.split(".").pop().toLowerCase());
})
fileNames = fileNames.sort((a, b) => {
if (isNaN(a.charAt()) || isNaN(b.charAt())) throw new Error("Incorrect file name format");

13
data/emulator.js
View file

@ -808,7 +808,7 @@ class EmulatorJS {
}
let resData = {};
const isPsx = (this.getCore(true) === "psx" && this.getCore() !== "pcsx_rearmed");
const needsCue = (["mednafen_psx", "mednafen_psx_hw", "picodrive"].includes(this.getCore()));
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) => {
if (fileName.includes("/")) {
@ -826,7 +826,7 @@ class EmulatorJS {
FS.mkdir(fileName);
return;
}
if (isPsx && ["m3u", "cue"].includes(fileName.split(".").pop().toLowerCase())) {
if (needsCue && ["m3u", "cue"].includes(fileName.split(".").pop().toLowerCase())) {
resData[fileName] = fileData;
} else if (fileName !== "!!notCompressedData") {
resData[fileName] = true;
@ -845,14 +845,13 @@ class EmulatorJS {
})();
if (fileNames.length === 1) fileNames[0] = altName;
let execFile = null;
if (isPsx) {
//Not needed for pcsx_rearmed core
if (needsCue) {
execFile = this.gameManager.createCueFile(fileNames);
}
for (const k in resData) {
if (k === "!!notCompressedData") {
if (isPsx && execFile !== null) {
if (needsCue && execFile !== null) {
this.fileName = execFile;
} else {
this.fileName = altName;
@ -864,11 +863,11 @@ class EmulatorJS {
!(this.getCore(true) === "psx" && ["m3u", "ccd"].includes(this.fileName.split(".").pop())))) {
this.fileName = k;
}
if (isPsx && execFile === null && ["m3u", "cue"].includes(k.split(".").pop().toLowerCase())) {
if (needsCue && execFile === null && ["m3u", "cue"].includes(k.split(".").pop().toLowerCase())) {
FS.writeFile("/"+k, resData[k]);
}
}
if (isPsx && execFile !== null) {
if (needsCue && execFile !== null) {
this.fileName = execFile;
}
resolve();

2
data/emulator.min.js vendored
View file

File diff suppressed because one or more lines are too long