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

Minor style cleanups

This commit is contained in:
YoshiRulz 2020-06-18 03:00:10 +10:00
parent 01e3a6cf43
commit e71f5b32f0
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,7 +27,7 @@ namespace BizHawk.Emulation.Cores.Consoles.NEC.PCE
NymaSettings settings, NymaSyncSettings syncSettings, bool deterministic)
: base(comm, "PCE", "PC Engine Controller", settings, syncSettings)
{
var firmwares = new Dictionary<string, ValueTuple<string, string>>
var firmwares = new Dictionary<string, (string, string)>
{
{ "FIRMWARE:syscard3.pce", ("PCECD", "Bios") },
// { "FIRMWARE:gecard.pce", ("PCECD", "GE-Bios") },

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

@ -29,7 +29,7 @@ namespace BizHawk.Emulation.Cores.Consoles.NEC.PCE
NymaSettings settings, NymaSyncSettings syncSettings, bool deterministic)
: base(comm, "PCE", "PC Engine Controller", settings, syncSettings)
{
var firmwares = new Dictionary<string, ValueTuple<string, string>>
var firmwares = new Dictionary<string, (string, string)>
{
{ "FIRMWARE:syscard3.pce", ("PCECD", "Bios") },
{ "FIRMWARE:gecard.pce", ("PCECD", "GE-Bios") },

2
src/BizHawk.Emulation.Cores/Consoles/NEC/PCFX/Tst.cs
View File

@ -28,7 +28,7 @@ namespace BizHawk.Emulation.Cores.Consoles.NEC.PCFX
IEnumerable<Disc> disks, NymaSettings settings, NymaSyncSettings syncSettings, bool deterministic)
: base(comm, "PCFX", "PCFX Controller Deck", settings, syncSettings)
{
var firmwares = new Dictionary<string, ValueTuple<string, string>>
var firmwares = new Dictionary<string, (string, string)>
{
{ "FIRMWARE:pcfx.rom", ("PCFX", "BIOS") },
};

2
src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/BootGodDB.cs
View File

@ -24,7 +24,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
public static void Initialize(string basePath)
{
if (acquire != null) throw new InvalidOperationException("Bootgod DB multiply initialized");
acquire = new EventWaitHandle(false, EventResetMode.ManualReset); ;
acquire = new EventWaitHandle(false, EventResetMode.ManualReset);
var stopwatch = Stopwatch.StartNew();
ThreadPool.QueueUserWorkItem(_ =>

2
src/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Saturnus.cs
View File

@ -30,7 +30,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.Saturn
IEnumerable<Disc> disks, NymaSettings settings, NymaSyncSettings syncSettings, bool deterministic)
: base(comm, "SAT", "Saturn Controller Deck", settings, syncSettings)
{
var firmwares = new Dictionary<string, ValueTuple<string, string>>
var firmwares = new Dictionary<string, (string, string)>
{
{ "FIRMWARE:$J", ("SAT", "J") },
{ "FIRMWARE:$U", ("SAT", "U") },

6
src/BizHawk.Emulation.Cores/Waterbox/NymaCore.cs
View File

@ -14,7 +14,7 @@ using NymaTypes;
namespace BizHawk.Emulation.Cores.Waterbox
{
public unsafe abstract partial class NymaCore : WaterboxCore
public abstract unsafe partial class NymaCore : WaterboxCore
{
protected NymaCore(CoreComm comm,
string systemId, string controllerDeckName,
@ -29,7 +29,7 @@ namespace BizHawk.Emulation.Cores.Waterbox
private LibNymaCore _nyma;
protected T DoInit<T>(GameInfo game, byte[] rom, Disc[] discs, string wbxFilename, string extension, bool deterministic,
IDictionary<string, ValueTuple<string, string>> firmwares = null)
IDictionary<string, (string SystemID, string FirmwareID)> firmwares = null)
where T : LibNymaCore
{
var t = PreInit<T>(new WaterboxOptions
@ -63,7 +63,7 @@ namespace BizHawk.Emulation.Cores.Waterbox
{
if (firmwares.TryGetValue(s, out var tt))
{
var data = CoreComm.CoreFileProvider.GetFirmware(tt.Item1, tt.Item2, false,
var data = CoreComm.CoreFileProvider.GetFirmware(tt.SystemID, tt.FirmwareID, false,
"Firmware files are usually required and may stop your game from loading");
if (data != null)
{