From c712bde84eb1ea7bd027a4516cc59d5313582df2 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sat, 11 Jul 2020 20:10:23 -0500
Subject: [PATCH] remove firmware manager dependency from RomLoader, and a few
 other cleanups

---
 src/BizHawk.Client.Common/RomLoader.cs          | 7 ++-----
 src/BizHawk.Client.EmuHawk/MainForm.cs          | 2 +-
 src/BizHawk.Client.EmuHawk/tools/BatchRunner.cs | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/BizHawk.Client.Common/RomLoader.cs b/src/BizHawk.Client.Common/RomLoader.cs
index 9602c8826f..f97d1c1ac5 100644
--- a/src/BizHawk.Client.Common/RomLoader.cs
+++ b/src/BizHawk.Client.Common/RomLoader.cs
@@ -9,7 +9,6 @@ using BizHawk.Common.StringExtensions;
 using BizHawk.Emulation.Common;
 using BizHawk.Emulation.Cores;
 using BizHawk.Emulation.Cores.Libretro;
-using BizHawk.Emulation.Cores.Calculators;
 using BizHawk.Emulation.Cores.Computers.AppleII;
 using BizHawk.Emulation.Cores.Computers.Commodore64;
 using BizHawk.Emulation.Cores.Consoles.Sega.gpgx;
@@ -52,12 +51,10 @@ namespace BizHawk.Client.Common
 			public string Extension { get; set; }
 		}
 		private readonly Config _config;
-		private readonly FirmwareManager _firmwareManager;
 
-		public RomLoader(Config config, FirmwareManager firmwareManager)
+		public RomLoader(Config config)
 		{
 			_config = config;
-			_firmwareManager = firmwareManager;
 		}
 
 		public enum LoadErrorType
@@ -717,7 +714,7 @@ namespace BizHawk.Client.Common
 						nextEmulator = new AppleII(
 							nextComm,
 							xmlGame.Assets.Select(a => a.Value),
-							(AppleII.Settings) GetCoreSettings<AppleII, AppleII.Settings>()
+							GetCoreSettings<AppleII, AppleII.Settings>()
 						);
 						return true;
 					case "C64":
diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs
index 29081796f4..3d159e3d2f 100644
--- a/src/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/src/BizHawk.Client.EmuHawk/MainForm.cs
@@ -3504,7 +3504,7 @@ namespace BizHawk.Client.EmuHawk
 					return false;
 				}
 
-				var loader = new RomLoader(Config, GlobalWin.FirmwareManager)
+				var loader = new RomLoader(Config)
 				{
 					ChooseArchive = LoadArchiveChooser,
 					ChoosePlatform = ChoosePlatformForRom,
diff --git a/src/BizHawk.Client.EmuHawk/tools/BatchRunner.cs b/src/BizHawk.Client.EmuHawk/tools/BatchRunner.cs
index 196c796462..25cba04bd5 100644
--- a/src/BizHawk.Client.EmuHawk/tools/BatchRunner.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/BatchRunner.cs
@@ -69,7 +69,7 @@ namespace BizHawk.Client.EmuHawk
 			_files = new List<string>(files);
 			_numFrames = numFrames;
 
-			_ldr = new RomLoader(GlobalWin.Config, GlobalWin.FirmwareManager);
+			_ldr = new RomLoader(GlobalWin.Config);
 			_ldr.OnLoadError += OnLoadError;
 			_ldr.ChooseArchive = ChooseArchive;
 			_comm = comm;