From 981dc95c62ec0fb4275a0aaec4afe58d7054b7cd Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sat, 6 Jun 2020 14:55:26 -0500
Subject: [PATCH] pass FirmwareManager into RomLoader instead of using Global
---
src/BizHawk.Client.Common/RomLoader.cs | 6 ++++--
src/BizHawk.Client.EmuHawk/MainForm.cs | 2 +-
src/BizHawk.Client.EmuHawk/tools/BatchRunner.cs | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/BizHawk.Client.Common/RomLoader.cs b/src/BizHawk.Client.Common/RomLoader.cs
index bc73e5191c..0db096835d 100644
--- a/src/BizHawk.Client.Common/RomLoader.cs
+++ b/src/BizHawk.Client.Common/RomLoader.cs
@@ -34,10 +34,12 @@ namespace BizHawk.Client.Common
public class RomLoader
{
private readonly Config _config;
+ private readonly FirmwareManager _firmwareManager;
- public RomLoader(Config config)
+ public RomLoader(Config config, FirmwareManager firmwareManager)
{
_config = config;
+ _firmwareManager = firmwareManager;
}
public enum LoadErrorType
@@ -889,7 +891,7 @@ namespace BizHawk.Client.Common
var ti83Bios = nextComm.CoreFileProvider.GetFirmware("TI83", "Rom", true);
// TODO: make the ti-83 a proper firmware file
- var ti83BiosPath = Global.FirmwareManager.Request(_config.PathEntries, _config.FirmwareUserSpecifications, "TI83", "Rom");
+ var ti83BiosPath = _firmwareManager.Request(_config.PathEntries, _config.FirmwareUserSpecifications, "TI83", "Rom");
using (var ti83AsHawkFile = new HawkFile(ti83BiosPath))
{
var ti83BiosAsRom = new RomGame(ti83AsHawkFile);
diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs
index c4dfa83ab0..38f090f26f 100644
--- a/src/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/src/BizHawk.Client.EmuHawk/MainForm.cs
@@ -3628,7 +3628,7 @@ namespace BizHawk.Client.EmuHawk
return false;
}
- var loader = new RomLoader(Config)
+ var loader = new RomLoader(Config, Global.FirmwareManager)
{
ChooseArchive = LoadArchiveChooser,
ChoosePlatform = ChoosePlatformForRom,
diff --git a/src/BizHawk.Client.EmuHawk/tools/BatchRunner.cs b/src/BizHawk.Client.EmuHawk/tools/BatchRunner.cs
index b75b2637f3..6874cc6063 100644
--- a/src/BizHawk.Client.EmuHawk/tools/BatchRunner.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/BatchRunner.cs
@@ -70,7 +70,7 @@ namespace BizHawk.Client.EmuHawk
_files = new List<string>(files);
_numFrames = numFrames;
- _ldr = new RomLoader(GlobalWin.Config);
+ _ldr = new RomLoader(GlobalWin.Config, Global.FirmwareManager);
_ldr.OnLoadError += OnLoadError;
_ldr.ChooseArchive = ChooseArchive;
_comm = mainForm.CreateCoreComm();