From 77f824ab5543dbca423866615fabd3b4f6a11d1a Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Thu, 3 Nov 2022 11:56:01 +1000 Subject: [PATCH] Clean up `MGBAHawk.DeterministicEmulation` assignment --- .../Consoles/Nintendo/GBA/MGBAHawk.cs | 31 ++++++------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.cs index fbedaa6433..2cf68f0321 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.cs @@ -27,30 +27,19 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA { _syncSettings = syncSettings ?? new SyncSettings(); _settings = settings ?? new Settings(); - DeterministicEmulation = deterministic; var bios = comm.CoreFileProvider.GetFirmware(new("GBA", "Bios")); - DeterministicEmulation &= bios != null; + if (bios is { Length: not 0x4000 }) throw new InvalidOperationException("BIOS must be exactly 16384 bytes!"); + if (deterministic && bios is null) throw new MissingFirmwareException("A BIOS is required for deterministic recordings!"); + DeterministicEmulation = deterministic + || (bios is not null && !_syncSettings.RTCUseRealTime && !_syncSettings.SkipBios); // in this case, the core is deterministic even though it wasn't asked to be - if (DeterministicEmulation != deterministic) - { - throw new MissingFirmwareException("A BIOS is required for deterministic recordings!"); - } - - if (!DeterministicEmulation && bios != null && !_syncSettings.RTCUseRealTime && !_syncSettings.SkipBios) - { - // in these situations, this core is deterministic even though it wasn't asked to be - DeterministicEmulation = true; - } - - if (bios != null && bios.Length != 16384) - { - throw new InvalidOperationException("BIOS must be exactly 16384 bytes!"); - } - - var skipBios = !DeterministicEmulation && _syncSettings.SkipBios; - - Core = LibmGBA.BizCreate(bios, file, file.Length, GetOverrideInfo(_syncSettings), skipBios); + Core = LibmGBA.BizCreate( + bios, + file, + file.Length, + GetOverrideInfo(_syncSettings), + skipBios: _syncSettings.SkipBios && !DeterministicEmulation); if (Core == IntPtr.Zero) { throw new InvalidOperationException($"{nameof(LibmGBA.BizCreate)}() returned NULL! Bad BIOS? and/or ROM?");