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

Ensure there can be no edge cases involving SGXCD sysID 

breaks config, in case you care about setting a custom save dir for PCE
This commit is contained in:
YoshiRulz 2022-07-25 06:27:24 +10:00
parent 3d42b19797
commit 070e7035b3
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
6 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/BizHawk.Client.Common/config/Config.cs
View File

@ -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,
};

2
src/BizHawk.Client.Common/config/PathEntryCollection.cs
View File

@ -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);

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

@ -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<NymaSettings, NymaSyncSettings> lp)
: base(lp.Comm, VSystemID.Raw.PCE, "PC Engine Controller", lp.Settings, lp.SyncSettings)
{

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

@ -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<NymaSettings, NymaSyncSettings> lp)
: base(lp.Comm, VSystemID.Raw.PCE, "PC Engine Controller", lp.Settings, lp.SyncSettings)
{

1
src/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs
View File

@ -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<PCESettings, PCESyncSettings> lp)
{
if (lp.Discs.Count == 1 && lp.Roms.Count == 0)

4
src/BizHawk.Emulation.Cores/vpads_schemata/PceSchema.cs
View File

@ -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 { }