From d28f827b06eecc63e5dbcaab71692fbc29728559 Mon Sep 17 00:00:00 2001 From: zeromus Date: Sun, 7 Jun 2020 16:04:05 -0500 Subject: [PATCH] rename TurboTurboNyma and LibTerboGrafixSanic to HyperNyma.. I think --- src/BizHawk.Client.Common/RomLoader.cs | 6 +++--- src/BizHawk.Client.EmuHawk/EmuHawkUtil.cs | 2 +- src/BizHawk.Client.EmuHawk/MainForm.cs | 2 +- .../PCE/{TerboGrafixSanic.cs => HyperNyma.cs} | 16 ++++++++-------- src/BizHawk.Emulation.Cores/CoreNames.cs | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) rename src/BizHawk.Emulation.Cores/Consoles/NEC/PCE/{TerboGrafixSanic.cs => HyperNyma.cs} (74%) diff --git a/src/BizHawk.Client.Common/RomLoader.cs b/src/BizHawk.Client.Common/RomLoader.cs index 3ad326a66f..e6693c8f08 100644 --- a/src/BizHawk.Client.Common/RomLoader.cs +++ b/src/BizHawk.Client.Common/RomLoader.cs @@ -353,12 +353,12 @@ namespace BizHawk.Client.Common GetCoreSettings(), GetCoreSyncSettings() ), -// CoreNames.TurboTurboNyma => new TerboGrafixSanic( +// CoreNames.HyperNyma => new HyperNyma( // game, // new[] { disc }, // nextComm, -// (NymaCore.NymaSettings) GetCoreSettings(), -// (NymaCore.NymaSyncSettings) GetCoreSyncSettings(), +// (NymaCore.NymaSettings) GetCoreSettings(), +// (NymaCore.NymaSyncSettings) GetCoreSyncSettings(), // Deterministic // ), _ => new TerboGrafix( diff --git a/src/BizHawk.Client.EmuHawk/EmuHawkUtil.cs b/src/BizHawk.Client.EmuHawk/EmuHawkUtil.cs index 9c1c35a960..14a1e8341c 100644 --- a/src/BizHawk.Client.EmuHawk/EmuHawkUtil.cs +++ b/src/BizHawk.Client.EmuHawk/EmuHawkUtil.cs @@ -47,7 +47,7 @@ namespace BizHawk.Client.EmuHawk { Snes9x _ => PromptToSwitchCore(CoreNames.Snes9X, CoreNames.Bsnes, () => GlobalWin.Config.PreferredCores["SNES"] = CoreNames.Bsnes), QuickNES _ => PromptToSwitchCore(CoreNames.QuickNes, CoreNames.NesHawk, () => GlobalWin.Config.PreferredCores["NES"] = CoreNames.NesHawk), - TerboGrafixSanic _ => PromptToSwitchCore(CoreNames.TurboTurboNyma, CoreNames.TurboNyma, () => GlobalWin.Config.PreferredCores["NES"] = CoreNames.NesHawk), + HyperNyma _ => PromptToSwitchCore(CoreNames.HyperNyma, CoreNames.TurboNyma, () => GlobalWin.Config.PreferredCores["NES"] = CoreNames.NesHawk), _ => true }; } diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs index 66747d5c7b..bd66fdaa59 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.cs @@ -44,7 +44,7 @@ namespace BizHawk.Client.EmuHawk (new[] { "SNES" }, new[] { CoreNames.Faust, CoreNames.Snes9X, CoreNames.Bsnes }), (new[] { "SGB" }, new[] { CoreNames.Bsnes, CoreNames.SameBoy }), (new[] { "GB", "GBC" }, new[] { CoreNames.Gambatte, CoreNames.GbHawk, CoreNames.SubGbHawk }), - (new[] { "PCE", "PCECD", "SGX" }, new[] { CoreNames.TurboTurboNyma, CoreNames.PceHawk, CoreNames.TurboNyma }) + (new[] { "PCE", "PCECD", "SGX" }, new[] { CoreNames.HyperNyma, CoreNames.PceHawk, CoreNames.TurboNyma }) }; private void MainForm_Load(object sender, EventArgs e) diff --git a/src/BizHawk.Emulation.Cores/Consoles/NEC/PCE/TerboGrafixSanic.cs b/src/BizHawk.Emulation.Cores/Consoles/NEC/PCE/HyperNyma.cs similarity index 74% rename from src/BizHawk.Emulation.Cores/Consoles/NEC/PCE/TerboGrafixSanic.cs rename to src/BizHawk.Emulation.Cores/Consoles/NEC/PCE/HyperNyma.cs index cb981555e9..8ef1f362c0 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/NEC/PCE/TerboGrafixSanic.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/NEC/PCE/HyperNyma.cs @@ -11,19 +11,19 @@ using BizHawk.Emulation.DiscSystem; namespace BizHawk.Emulation.Cores.Consoles.NEC.PCE { - [Core(CoreNames.TurboTurboNyma, "Mednafen Team", true, true, "1.24.3", "https://mednafen.github.io/releases/", false)] - public class TerboGrafixSanic : NymaCore, IRegionable, IPceGpuView + [Core(CoreNames.HyperNyma, "Mednafen Team", true, true, "1.24.3", "https://mednafen.github.io/releases/", false)] + public class HyperNyma : NymaCore, IRegionable, IPceGpuView { - private readonly LibTerboGrafixSanic _terboGrafix; + private readonly LibHyperNyma _terboGrafix; [CoreConstructor(new[] { "PCE", "SGX" })] - public TerboGrafixSanic(GameInfo game, byte[] rom, CoreComm comm, string extension, + public HyperNyma(GameInfo game, byte[] rom, CoreComm comm, string extension, NymaSettings settings, NymaSyncSettings syncSettings, bool deterministic) : base(comm, "PCE", "PC Engine Controller", settings, syncSettings) { - _terboGrafix = DoInit(game, rom, null, "pce-fast.wbx", extension, deterministic); + _terboGrafix = DoInit(game, rom, null, "pce-fast.wbx", extension, deterministic); } - public TerboGrafixSanic(GameInfo game, Disc[] discs, CoreComm comm, + public HyperNyma(GameInfo game, Disc[] discs, CoreComm comm, NymaSettings settings, NymaSyncSettings syncSettings, bool deterministic) : base(comm, "PCE", "PC Engine Controller", settings, syncSettings) { @@ -31,7 +31,7 @@ namespace BizHawk.Emulation.Cores.Consoles.NEC.PCE { { "FIRMWARE:syscard3.pce", comm.CoreFileProvider.GetFirmware("PCECD", "Bios", true) }, }; - _terboGrafix = DoInit(game, null, discs, "pce-fast.wbx", null, deterministic, firmwares); + _terboGrafix = DoInit(game, null, discs, "pce-fast.wbx", null, deterministic, firmwares); } public override string SystemId => IsSgx ? "SGX" : "PCE"; @@ -77,7 +77,7 @@ namespace BizHawk.Emulation.Cores.Consoles.NEC.PCE } } - public abstract class LibTerboGrafixSanic : LibNymaCore + public abstract class LibHyperNyma : LibNymaCore { [BizImport(CallingConvention.Cdecl, Compatibility = true)] public abstract void GetVramInfo([Out]PceGpuData v, int vdcIndex); diff --git a/src/BizHawk.Emulation.Cores/CoreNames.cs b/src/BizHawk.Emulation.Cores/CoreNames.cs index d603a23509..8d76346104 100644 --- a/src/BizHawk.Emulation.Cores/CoreNames.cs +++ b/src/BizHawk.Emulation.Cores/CoreNames.cs @@ -22,7 +22,7 @@ namespace BizHawk.Emulation.Cores public const string Gpgx = "Genplus-gx"; public const string PceHawk = "PCEHawk"; public const string TurboNyma = "TurboNyma"; - public const string TurboTurboNyma = "TurboTurboNyma"; + public const string HyperNyma = "HyperNyma"; public const string Faust = "Faust"; } }