From 070e7035b3e3ad2b28c1a25b0506e4ba8975cf9c Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Mon, 25 Jul 2022 06:27:24 +1000 Subject: [PATCH] Ensure there can be no edge cases involving SGXCD sysID breaks config, in case you care about setting a custom save dir for PCE --- src/BizHawk.Client.Common/config/Config.cs | 3 ++- src/BizHawk.Client.Common/config/PathEntryCollection.cs | 2 +- src/BizHawk.Emulation.Cores/Consoles/NEC/PCE/HyperNyma.cs | 1 + src/BizHawk.Emulation.Cores/Consoles/NEC/PCE/TurboNyma.cs | 1 + src/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs | 1 + src/BizHawk.Emulation.Cores/vpads_schemata/PceSchema.cs | 4 ++++ 6 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/BizHawk.Client.Common/config/Config.cs b/src/BizHawk.Client.Common/config/Config.cs index b1f8837484..7228aac581 100644 --- a/src/BizHawk.Client.Common/config/Config.cs +++ b/src/BizHawk.Client.Common/config/Config.cs @@ -36,7 +36,7 @@ namespace BizHawk.Client.Common new[] { CoreNames.Gambatte, CoreNames.Sameboy, CoreNames.GbHawk, CoreNames.SubGbHawk }), (new[] { VSystemID.Raw.GBL }, new[] { CoreNames.GambatteLink, CoreNames.GBHawkLink, CoreNames.GBHawkLink3x, CoreNames.GBHawkLink4x }), - (new[] { VSystemID.Raw.PCE, VSystemID.Raw.PCECD, VSystemID.Raw.SGX }, + (new[] { VSystemID.Raw.PCE, VSystemID.Raw.PCECD, VSystemID.Raw.SGX, VSystemID.Raw.SGXCD }, new[] { CoreNames.TurboNyma, CoreNames.HyperNyma, CoreNames.PceHawk }), (new[] { VSystemID.Raw.PSX }, new[] { CoreNames.Octoshock, CoreNames.Nymashock }), @@ -329,6 +329,7 @@ namespace BizHawk.Client.Common [VSystemID.Raw.PCE] = CoreNames.TurboNyma, [VSystemID.Raw.PCECD] = CoreNames.TurboNyma, [VSystemID.Raw.SGX] = CoreNames.TurboNyma, + [VSystemID.Raw.SGXCD] = CoreNames.TurboNyma, [VSystemID.Raw.PSX] = CoreNames.Nymashock, [VSystemID.Raw.TI83] = CoreNames.Emu83, }; diff --git a/src/BizHawk.Client.Common/config/PathEntryCollection.cs b/src/BizHawk.Client.Common/config/PathEntryCollection.cs index 77d7f5aee6..98e2700515 100644 --- a/src/BizHawk.Client.Common/config/PathEntryCollection.cs +++ b/src/BizHawk.Client.Common/config/PathEntryCollection.cs @@ -15,7 +15,7 @@ namespace BizHawk.Client.Common { private static readonly string COMBINED_SYSIDS_GB = string.Join("_", VSystemID.Raw.GB, VSystemID.Raw.GBC, VSystemID.Raw.SGB); - private static readonly string COMBINED_SYSIDS_PCE = string.Join("_", VSystemID.Raw.PCE, VSystemID.Raw.PCECD, VSystemID.Raw.SGX); + private static readonly string COMBINED_SYSIDS_PCE = string.Join("_", VSystemID.Raw.PCE, VSystemID.Raw.PCECD, VSystemID.Raw.SGX, VSystemID.Raw.SGXCD); public static readonly string GLOBAL = string.Join("_", "Global", VSystemID.Raw.NULL); diff --git a/src/BizHawk.Emulation.Cores/Consoles/NEC/PCE/HyperNyma.cs b/src/BizHawk.Emulation.Cores/Consoles/NEC/PCE/HyperNyma.cs index a89d1461d1..db4e95d88c 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/NEC/PCE/HyperNyma.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/NEC/PCE/HyperNyma.cs @@ -38,6 +38,7 @@ namespace BizHawk.Emulation.Cores.Consoles.NEC.PCE [CoreConstructor(VSystemID.Raw.PCE, Priority = CorePriority.Low)] [CoreConstructor(VSystemID.Raw.SGX, Priority = CorePriority.Low)] [CoreConstructor(VSystemID.Raw.PCECD, Priority = CorePriority.Low)] + [CoreConstructor(VSystemID.Raw.SGXCD, Priority = CorePriority.Low)] public HyperNyma(CoreLoadParameters lp) : base(lp.Comm, VSystemID.Raw.PCE, "PC Engine Controller", lp.Settings, lp.SyncSettings) { diff --git a/src/BizHawk.Emulation.Cores/Consoles/NEC/PCE/TurboNyma.cs b/src/BizHawk.Emulation.Cores/Consoles/NEC/PCE/TurboNyma.cs index e5295d6336..60978421dd 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/NEC/PCE/TurboNyma.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/NEC/PCE/TurboNyma.cs @@ -40,6 +40,7 @@ namespace BizHawk.Emulation.Cores.Consoles.NEC.PCE [CoreConstructor(VSystemID.Raw.PCE)] [CoreConstructor(VSystemID.Raw.SGX)] [CoreConstructor(VSystemID.Raw.PCECD)] + [CoreConstructor(VSystemID.Raw.SGXCD)] public TurboNyma(CoreLoadParameters lp) : base(lp.Comm, VSystemID.Raw.PCE, "PC Engine Controller", lp.Settings, lp.SyncSettings) { diff --git a/src/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs b/src/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs index 437191fd0b..b99054a565 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs @@ -23,6 +23,7 @@ namespace BizHawk.Emulation.Cores.PCEngine [CoreConstructor(VSystemID.Raw.PCE, Priority = CorePriority.Low)] [CoreConstructor(VSystemID.Raw.SGX, Priority = CorePriority.Low)] [CoreConstructor(VSystemID.Raw.PCECD, Priority = CorePriority.Low)] + [CoreConstructor(VSystemID.Raw.SGXCD, Priority = CorePriority.Low)] public PCEngine(CoreLoadParameters lp) { if (lp.Discs.Count == 1 && lp.Roms.Count == 0) diff --git a/src/BizHawk.Emulation.Cores/vpads_schemata/PceSchema.cs b/src/BizHawk.Emulation.Cores/vpads_schemata/PceSchema.cs index e2c983657f..517efd57a7 100644 --- a/src/BizHawk.Emulation.Cores/vpads_schemata/PceSchema.cs +++ b/src/BizHawk.Emulation.Cores/vpads_schemata/PceSchema.cs @@ -10,6 +10,10 @@ using BizHawk.Emulation.Cores.Waterbox; namespace BizHawk.Emulation.Cores { + [Schema(VSystemID.Raw.SGXCD)] + // ReSharper disable once UnusedMember.Global + public class SgxCdSchema : PceSchema { } + [Schema(VSystemID.Raw.PCECD)] // ReSharper disable once UnusedMember.Global public class PceCdSchema : PceSchema { }