From 485817a8e4415644de7b53a0b65d6f10b64b9e50 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Mon, 22 Feb 2021 22:40:40 +1000 Subject: [PATCH] Replace (string, string) w/ FirmwareID in nyma core ctors --- .../Consoles/NEC/PCE/HyperNyma.cs | 4 ++-- .../Consoles/NEC/PCE/TurboNyma.cs | 6 +++--- src/BizHawk.Emulation.Cores/Consoles/NEC/PCFX/Tst.cs | 4 ++-- .../Consoles/Sega/Saturn/Saturnus.cs | 12 ++++++------ src/BizHawk.Emulation.Cores/Waterbox/NymaCore.cs | 8 ++++---- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/BizHawk.Emulation.Cores/Consoles/NEC/PCE/HyperNyma.cs b/src/BizHawk.Emulation.Cores/Consoles/NEC/PCE/HyperNyma.cs index 12c3d70442..df5233ac29 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/NEC/PCE/HyperNyma.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/NEC/PCE/HyperNyma.cs @@ -21,11 +21,11 @@ namespace BizHawk.Emulation.Cores.Consoles.NEC.PCE public HyperNyma(CoreLoadParameters lp) : base(lp.Comm, "PCE", "PC Engine Controller", lp.Settings, lp.SyncSettings) { - var firmwares = new Dictionary(); + var firmwares = new Dictionary(); if (lp.Discs.Count > 0) { _hasCds = true; - firmwares.Add("FIRMWARE:syscard3.pce", ("PCECD", "Bios")); + firmwares.Add("FIRMWARE:syscard3.pce", new("PCECD", "Bios")); } _hyperNyma = DoInit(lp, "hyper.wbx", firmwares); diff --git a/src/BizHawk.Emulation.Cores/Consoles/NEC/PCE/TurboNyma.cs b/src/BizHawk.Emulation.Cores/Consoles/NEC/PCE/TurboNyma.cs index ba8014f04c..a8eb83ebfb 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/NEC/PCE/TurboNyma.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/NEC/PCE/TurboNyma.cs @@ -23,15 +23,15 @@ namespace BizHawk.Emulation.Cores.Consoles.NEC.PCE public TurboNyma(CoreLoadParameters lp) : base(lp.Comm, "PCE", "PC Engine Controller", lp.Settings, lp.SyncSettings) { - var firmwares = new Dictionary(); + var firmwares = new Dictionary(); if (lp.Discs.Count > 0) { _hasCds = true; var ids = lp.Discs.Select(dg => dg.DiscType).ToList(); if (ids.Contains(DiscType.TurboCD)) - firmwares.Add("FIRMWARE:syscard3.pce", ("PCECD", "Bios")); + firmwares.Add("FIRMWARE:syscard3.pce", new("PCECD", "Bios")); if (ids.Contains(DiscType.TurboGECD)) - firmwares.Add("FIRMWARE:gecard.pce", ("PCECD", "GE-Bios")); + firmwares.Add("FIRMWARE:gecard.pce", new("PCECD", "GE-Bios")); } else if (lp.Roms.Count == 1) { diff --git a/src/BizHawk.Emulation.Cores/Consoles/NEC/PCFX/Tst.cs b/src/BizHawk.Emulation.Cores/Consoles/NEC/PCFX/Tst.cs index 23d032cad5..c65b81d385 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/NEC/PCFX/Tst.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/NEC/PCFX/Tst.cs @@ -15,9 +15,9 @@ namespace BizHawk.Emulation.Cores.Consoles.NEC.PCFX { if (lp.Roms.Count > 0) throw new InvalidOperationException("To load a PC-FX game, please load the CUE file and not the BIN file."); - var firmwares = new Dictionary + var firmwares = new Dictionary { - { "FIRMWARE:pcfx.rom", ("PCFX", "BIOS") }, + { "FIRMWARE:pcfx.rom", new("PCFX", "BIOS") }, }; DoInit(lp, "pcfx.wbx", firmwares); diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Saturnus.cs b/src/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Saturnus.cs index 6f3e56b7c3..9ef6195e08 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Saturnus.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Saturnus.cs @@ -15,13 +15,13 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.Saturn { if (lp.Roms.Count > 0) throw new InvalidOperationException("To load a Saturn game, please load the CUE file and not the BIN file."); - var firmwares = new Dictionary + var firmwares = new Dictionary { - { "FIRMWARE:$J", ("SAT", "J") }, - { "FIRMWARE:$U", ("SAT", "U") }, - { "FIRMWARE:$KOF", ("SAT", "KOF95") }, - { "FIRMWARE:$ULTRA", ("SAT", "ULTRAMAN") }, - // { "FIRMWARE:$SATAR", ("SAT", "AR") }, // action replay garbage + { "FIRMWARE:$J", new("SAT", "J") }, + { "FIRMWARE:$U", new("SAT", "U") }, + { "FIRMWARE:$KOF", new("SAT", "KOF95") }, + { "FIRMWARE:$ULTRA", new("SAT", "ULTRAMAN") }, + // { "FIRMWARE:$SATAR", new("SAT", "AR") }, // action replay garbage }; DoInit(lp, "ss.wbx", firmwares); } diff --git a/src/BizHawk.Emulation.Cores/Waterbox/NymaCore.cs b/src/BizHawk.Emulation.Cores/Waterbox/NymaCore.cs index 39647e2051..86ae60f23e 100644 --- a/src/BizHawk.Emulation.Cores/Waterbox/NymaCore.cs +++ b/src/BizHawk.Emulation.Cores/Waterbox/NymaCore.cs @@ -30,7 +30,7 @@ namespace BizHawk.Emulation.Cores.Waterbox protected T DoInit( CoreLoadParameters lp, string wbxFilename, - IDictionary firmwares = null + IDictionary firmwares = null ) where T : LibNymaCore { @@ -45,7 +45,7 @@ namespace BizHawk.Emulation.Cores.Waterbox ); } protected T DoInit(GameInfo game, byte[] rom, Disc[] discs, string wbxFilename, string extension, bool deterministic, - IDictionary firmwares = null) + IDictionary firmwares = null) where T : LibNymaCore { _settingsQueryDelegate = SettingsQuery; @@ -56,9 +56,9 @@ namespace BizHawk.Emulation.Cores.Waterbox var firmwareDelegate = new LibNymaCore.FrontendFirmwareNotify((name) => { - if (firmwares != null && firmwares.TryGetValue(name, out var info)) + if (firmwares != null && firmwares.TryGetValue(name, out var id)) { - var data = CoreComm.CoreFileProvider.GetFirmware(info.SystemID, info.FirmwareID, true, + var data = CoreComm.CoreFileProvider.GetFirmware(id, true, "Firmware files are usually required and may stop your game from loading"); if (data != null) {