ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

s/firmwares/firmwareIDMap/ in Nyma core init methods

This commit is contained in:
YoshiRulz 2024-10-27 01:58:38 +10:00
parent 6955ad3591
commit eee34dd69a
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
6 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/BizHawk.Emulation.Cores/Consoles/NEC/PCE/HyperNyma.cs
View File

@ -41,14 +41,14 @@ namespace BizHawk.Emulation.Cores.Consoles.NEC.PCE
public HyperNyma(CoreLoadParameters<NymaSettings, NymaSyncSettings> lp) public HyperNyma(CoreLoadParameters<NymaSettings, NymaSyncSettings> lp)
: base(lp.Comm, VSystemID.Raw.PCE, "PC Engine Controller", lp.Settings, lp.SyncSettings) : base(lp.Comm, VSystemID.Raw.PCE, "PC Engine Controller", lp.Settings, lp.SyncSettings)
{ {
var firmwares = new Dictionary<string, FirmwareID>(); var firmwareIDMap = new Dictionary<string, FirmwareID>();
if (lp.Discs.Count > 0) if (lp.Discs.Count > 0)
{ {
_hasCds = true; _hasCds = true;
firmwares.Add("FIRMWARE:syscard3.pce", new("PCECD", "Bios")); firmwareIDMap.Add("FIRMWARE:syscard3.pce", new("PCECD", "Bios"));
} }
_hyperNyma = DoInit<LibHyperNyma>(lp, "hyper.wbx", firmwares); _hyperNyma = DoInit<LibHyperNyma>(lp, "hyper.wbx", firmwareIDMap);
_cachedSettingsInfo ??= SettingsInfo.Clone(); _cachedSettingsInfo ??= SettingsInfo.Clone();
} }

8
src/BizHawk.Emulation.Cores/Consoles/NEC/PCE/TurboNyma.cs
View File

@ -43,15 +43,15 @@ namespace BizHawk.Emulation.Cores.Consoles.NEC.PCE
public TurboNyma(CoreLoadParameters<NymaSettings, NymaSyncSettings> lp) public TurboNyma(CoreLoadParameters<NymaSettings, NymaSyncSettings> lp)
: base(lp.Comm, VSystemID.Raw.PCE, "PC Engine Controller", lp.Settings, lp.SyncSettings) : base(lp.Comm, VSystemID.Raw.PCE, "PC Engine Controller", lp.Settings, lp.SyncSettings)
{ {
var firmwares = new Dictionary<string, FirmwareID>(); var firmwareIDMap = new Dictionary<string, FirmwareID>();
if (lp.Discs.Count > 0) if (lp.Discs.Count > 0)
{ {
_hasCds = true; _hasCds = true;
var ids = lp.Discs.Select(dg => dg.DiscType).ToList(); var ids = lp.Discs.Select(dg => dg.DiscType).ToList();
if (ids.Contains(DiscType.TurboCD)) if (ids.Contains(DiscType.TurboCD))
firmwares.Add("FIRMWARE:syscard3.pce", new("PCECD", "Bios")); firmwareIDMap.Add("FIRMWARE:syscard3.pce", new("PCECD", "Bios"));
if (ids.Contains(DiscType.TurboGECD)) if (ids.Contains(DiscType.TurboGECD))
firmwares.Add("FIRMWARE:gecard.pce", new("PCECD", "GE-Bios")); firmwareIDMap.Add("FIRMWARE:gecard.pce", new("PCECD", "GE-Bios"));
} }
else if (lp.Roms.Count == 1) else if (lp.Roms.Count == 1)
{ {
@ -59,7 +59,7 @@ namespace BizHawk.Emulation.Cores.Consoles.NEC.PCE
SettingOverrides["pce.disable_bram_hucard"].Default = "0"; SettingOverrides["pce.disable_bram_hucard"].Default = "0";
} }
_turboNyma = DoInit<LibTurboNyma>(lp, "turbo.wbx", firmwares); _turboNyma = DoInit<LibTurboNyma>(lp, "turbo.wbx", firmwareIDMap);
_cachedSettingsInfo ??= SettingsInfo.Clone(); _cachedSettingsInfo ??= SettingsInfo.Clone();
} }

4
src/BizHawk.Emulation.Cores/Consoles/NEC/PCFX/Tst.cs
View File

@ -33,12 +33,12 @@ namespace BizHawk.Emulation.Cores.Consoles.NEC.PCFX
{ {
if (lp.Roms.Count > 0) if (lp.Roms.Count > 0)
throw new InvalidOperationException("To load a PC-FX game, please load the CUE file and not the BIN file."); throw new InvalidOperationException("To load a PC-FX game, please load the CUE file and not the BIN file.");
var firmwares = new Dictionary<string, FirmwareID> var firmwareIDMap = new Dictionary<string, FirmwareID>
{ {
{ "FIRMWARE:pcfx.rom", new("PCFX", "BIOS") }, { "FIRMWARE:pcfx.rom", new("PCFX", "BIOS") },
}; };
DoInit<LibNymaCore>(lp, "pcfx.wbx", firmwares); DoInit<LibNymaCore>(lp, "pcfx.wbx", firmwareIDMap);
_cachedSettingsInfo ??= SettingsInfo.Clone(); _cachedSettingsInfo ??= SettingsInfo.Clone();
} }

4
src/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Saturnus.cs
View File

@ -35,7 +35,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.Saturn
{ {
if (lp.Roms.Count > 0) if (lp.Roms.Count > 0)
throw new InvalidOperationException("To load a Saturn game, please load the CUE file and not the BIN file."); throw new InvalidOperationException("To load a Saturn game, please load the CUE file and not the BIN file.");
var firmwares = new Dictionary<string, FirmwareID> var firmwareIDMap = new Dictionary<string, FirmwareID>
{ {
{ "FIRMWARE:$J", new("SAT", "J") }, { "FIRMWARE:$J", new("SAT", "J") },
{ "FIRMWARE:$U", new("SAT", "U") }, { "FIRMWARE:$U", new("SAT", "U") },
@ -43,7 +43,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.Saturn
{ "FIRMWARE:$ULTRA", new("SAT", "ULTRAMAN") }, { "FIRMWARE:$ULTRA", new("SAT", "ULTRAMAN") },
// { "FIRMWARE:$SATAR", new("SAT", "AR") }, // action replay garbage // { "FIRMWARE:$SATAR", new("SAT", "AR") }, // action replay garbage
}; };
_saturnus = DoInit<LibSaturnus>(lp, "ss.wbx", firmwares); _saturnus = DoInit<LibSaturnus>(lp, "ss.wbx", firmwareIDMap);
_cachedSettingsInfo ??= SettingsInfo.Clone(); _cachedSettingsInfo ??= SettingsInfo.Clone();
} }

4
src/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Nymashock.cs
View File

@ -61,13 +61,13 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
public Nymashock(CoreLoadParameters<NymaSettings, NymaSyncSettings> lp) public Nymashock(CoreLoadParameters<NymaSettings, NymaSyncSettings> lp)
: base(lp.Comm, VSystemID.Raw.PSX, "PSX Front Panel", lp.Settings, lp.SyncSettings) : base(lp.Comm, VSystemID.Raw.PSX, "PSX Front Panel", lp.Settings, lp.SyncSettings)
{ {
var firmwares = new Dictionary<string, FirmwareID> var firmwareIDMap = new Dictionary<string, FirmwareID>
{ {
{ "FIRMWARE:$J", new("PSX", "J") }, { "FIRMWARE:$J", new("PSX", "J") },
{ "FIRMWARE:$U", new("PSX", "U") }, { "FIRMWARE:$U", new("PSX", "U") },
{ "FIRMWARE:$E", new("PSX", "E") }, { "FIRMWARE:$E", new("PSX", "E") },
}; };
DoInit<LibNymaCore>(lp, "shock.wbx", firmwares); DoInit<LibNymaCore>(lp, "shock.wbx", firmwareIDMap);
_cachedSettingsInfo ??= SettingsInfo.Clone(); _cachedSettingsInfo ??= SettingsInfo.Clone();

8
src/BizHawk.Emulation.Cores/Waterbox/NymaCore.cs
View File

@ -48,7 +48,7 @@ namespace BizHawk.Emulation.Cores.Waterbox
protected T DoInit<T>( protected T DoInit<T>(
CoreLoadParameters<NymaSettings, NymaSyncSettings> lp, CoreLoadParameters<NymaSettings, NymaSyncSettings> lp,
string wbxFilename, string wbxFilename,
IDictionary<string, FirmwareID> firmwares = null IDictionary<string, FirmwareID> firmwareIDMap = null
) )
where T : LibNymaCore where T : LibNymaCore
{ {
@ -59,11 +59,11 @@ namespace BizHawk.Emulation.Cores.Waterbox
wbxFilename, wbxFilename,
lp.Roms.FirstOrDefault()?.Extension, lp.Roms.FirstOrDefault()?.Extension,
lp.DeterministicEmulationRequested, lp.DeterministicEmulationRequested,
firmwares firmwareIDMap
); );
} }
protected T DoInit<T>(GameInfo game, byte[] rom, Disc[] discs, string wbxFilename, string extension, bool deterministic, protected T DoInit<T>(GameInfo game, byte[] rom, Disc[] discs, string wbxFilename, string extension, bool deterministic,
IDictionary<string, FirmwareID> firmwares = null) IDictionary<string, FirmwareID> firmwareIDMap = null)
where T : LibNymaCore where T : LibNymaCore
{ {
_settingsQueryDelegate = SettingsQuery; _settingsQueryDelegate = SettingsQuery;
@ -74,7 +74,7 @@ namespace BizHawk.Emulation.Cores.Waterbox
var firmwareDelegate = new LibNymaCore.FrontendFirmwareNotify((name) => var firmwareDelegate = new LibNymaCore.FrontendFirmwareNotify((name) =>
{ {
if (firmwares != null && firmwares.TryGetValue(name, out var id)) if (firmwareIDMap != null && firmwareIDMap.TryGetValue(name, out var id))
{ {
var data = CoreComm.CoreFileProvider.GetFirmwareOrThrow(id, "Firmware files are usually required and may stop your game from loading"); var data = CoreComm.CoreFileProvider.GetFirmwareOrThrow(id, "Firmware files are usually required and may stop your game from loading");
_exe.AddReadonlyFile(data, name); _exe.AddReadonlyFile(data, name);