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

PCEHawk: Use CoreLoadParameters for cd mode

This commit is contained in:
nattthebear 2020-07-12 13:06:15 -04:00
parent 744a9a97d0
commit ab07e67a07
2 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/BizHawk.Client.Common/RomLoader.cs
View File

@ -400,13 +400,7 @@ namespace BizHawk.Client.Common
var core = _config.PreferredCores.TryGetValue("PCECD", out var preferredCore) ? preferredCore : CoreNames.PceHawk; var core = _config.PreferredCores.TryGetValue("PCECD", out var preferredCore) ? preferredCore : CoreNames.PceHawk;
nextEmulator = core switch nextEmulator = core switch
{ {
CoreNames.PceHawk => new PCEngine( CoreNames.PceHawk => MakeCoreFromCds<PCEngine>(game),
nextComm,
game,
disc,
GetCoreSettings<PCEngine, PCEngine.PCESettings>(),
GetCoreSyncSettings<PCEngine, PCEngine.PCESyncSettings>()
),
CoreNames.HyperNyma => MakeCoreFromCds<HyperNyma>(game), CoreNames.HyperNyma => MakeCoreFromCds<HyperNyma>(game),
_ => MakeCoreFromCds<TurboNyma>(game), _ => MakeCoreFromCds<TurboNyma>(game),
}; };

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

@ -54,54 +54,54 @@ namespace BizHawk.Emulation.Cores.PCEngine
int IVideoLogicalOffsets.ScreenY => Settings.TopLine; int IVideoLogicalOffsets.ScreenY => Settings.TopLine;
public PCEngine(CoreComm comm, GameInfo game, Disc disc, PCESettings settings, PCESyncSettings syncSettings) public PCEngine(CoreLoadParameters<PCESettings, PCESyncSettings> lp)
{ {
SystemId = "PCECD"; SystemId = "PCECD";
Type = NecSystemType.TurboCD; Type = NecSystemType.TurboCD;
this.disc = disc; this.disc = lp.Discs[0].DiscData;
Settings = (PCESettings)settings ?? new PCESettings(); Settings = (PCESettings)lp.Settings ?? new PCESettings();
_syncSettings = (PCESyncSettings)syncSettings ?? new PCESyncSettings(); _syncSettings = (PCESyncSettings)lp.SyncSettings ?? new PCESyncSettings();
byte[] rom = comm.CoreFileProvider.GetFirmwareWithGameInfo("PCECD", "Bios", true, out var biosInfo, byte[] rom = lp.Comm.CoreFileProvider.GetFirmwareWithGameInfo("PCECD", "Bios", true, out var biosInfo,
"PCE-CD System Card not found. Please check the BIOS settings in Config->Firmwares."); "PCE-CD System Card not found. Please check the BIOS settings in Config->Firmwares.");
if (biosInfo.Status == RomStatus.BadDump) if (biosInfo.Status == RomStatus.BadDump)
{ {
comm.ShowMessage( lp.Comm.ShowMessage(
"The PCE-CD System Card you have selected is known to be a bad dump. This may cause problems playing PCE-CD games.\n\n" "The PCE-CD System Card you have selected is known to be a bad dump. This may cause problems playing PCE-CD games.\n\n"
+ "It is recommended that you find a good dump of the system card. Sorry to be the bearer of bad news!"); + "It is recommended that you find a good dump of the system card. Sorry to be the bearer of bad news!");
} }
else if (biosInfo.NotInDatabase) else if (biosInfo.NotInDatabase)
{ {
comm.ShowMessage( lp.Comm.ShowMessage(
"The PCE-CD System Card you have selected is not recognized in our database. That might mean it's a bad dump, or isn't the correct rom."); "The PCE-CD System Card you have selected is not recognized in our database. That might mean it's a bad dump, or isn't the correct rom.");
} }
else if (biosInfo["BIOS"] == false) else if (biosInfo["BIOS"] == false)
{ {
// zeromus says: someone please write a note about how this could possibly happen. // zeromus says: someone please write a note about how this could possibly happen.
// it seems like this is a relic of using gameDB for storing whether something is a bios? firmwareDB should be handling it now. // it seems like this is a relic of using gameDB for storing whether something is a bios? firmwareDB should be handling it now.
comm.ShowMessage( lp.Comm.ShowMessage(
"The PCE-CD System Card you have selected is not a BIOS image. You may have selected the wrong rom. FYI-Please report this to developers, I don't think this error message should happen."); "The PCE-CD System Card you have selected is not a BIOS image. You may have selected the wrong rom. FYI-Please report this to developers, I don't think this error message should happen.");
} }
if (biosInfo["SuperSysCard"]) if (biosInfo["SuperSysCard"])
{ {
game.AddOption("SuperSysCard", ""); lp.Game.AddOption("SuperSysCard", "");
} }
if (game["NeedSuperSysCard"] && game["SuperSysCard"] == false) if (lp.Game["NeedSuperSysCard"] && lp.Game["SuperSysCard"] == false)
{ {
comm.ShowMessage( lp.Comm.ShowMessage(
"This game requires a version 3.0 System card and won't run with the system card you've selected. Try selecting a 3.0 System Card in the firmware configuration."); "This game requires a version 3.0 System card and won't run with the system card you've selected. Try selecting a 3.0 System Card in the firmware configuration.");
throw new Exception(); throw new Exception();
} }
game.FirmwareHash = rom.HashSHA1(); lp.Game.FirmwareHash = rom.HashSHA1();
Init(game, rom); Init(lp.Game, rom);
// the default RomStatusDetails don't do anything with Disc // the default RomStatusDetails don't do anything with Disc
RomDetails = $"{game.Name}\r\nDisk partial hash:{new DiscHasher(disc).OldHash()}"; RomDetails = $"{lp.Game.Name}\r\nDisk partial hash:{new DiscHasher(disc).OldHash()}";
_controllerDeck = new PceControllerDeck( _controllerDeck = new PceControllerDeck(
_syncSettings.Port1, _syncSettings.Port1,