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

remove firmware manager dependency from RomLoader, and a few other cleanups

This commit is contained in:
adelikat 2020-07-11 20:10:23 -05:00
parent 467f0aff2b
commit c712bde84e
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,6 @@ using BizHawk.Common.StringExtensions;
using BizHawk.Emulation.Common; using BizHawk.Emulation.Common;
using BizHawk.Emulation.Cores; using BizHawk.Emulation.Cores;
using BizHawk.Emulation.Cores.Libretro; using BizHawk.Emulation.Cores.Libretro;
using BizHawk.Emulation.Cores.Calculators;
using BizHawk.Emulation.Cores.Computers.AppleII; using BizHawk.Emulation.Cores.Computers.AppleII;
using BizHawk.Emulation.Cores.Computers.Commodore64; using BizHawk.Emulation.Cores.Computers.Commodore64;
using BizHawk.Emulation.Cores.Consoles.Sega.gpgx; using BizHawk.Emulation.Cores.Consoles.Sega.gpgx;
@ -52,12 +51,10 @@ namespace BizHawk.Client.Common
public string Extension { get; set; } public string Extension { get; set; }
} }
private readonly Config _config; private readonly Config _config;
private readonly FirmwareManager _firmwareManager;
public RomLoader(Config config, FirmwareManager firmwareManager) public RomLoader(Config config)
{ {
_config = config; _config = config;
_firmwareManager = firmwareManager;
} }
public enum LoadErrorType public enum LoadErrorType
@ -717,7 +714,7 @@ namespace BizHawk.Client.Common
nextEmulator = new AppleII( nextEmulator = new AppleII(
nextComm, nextComm,
xmlGame.Assets.Select(a => a.Value), xmlGame.Assets.Select(a => a.Value),
(AppleII.Settings) GetCoreSettings<AppleII, AppleII.Settings>() GetCoreSettings<AppleII, AppleII.Settings>()
); );
return true; return true;
case "C64": case "C64":

2
src/BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -3504,7 +3504,7 @@ namespace BizHawk.Client.EmuHawk
return false; return false;
} }
var loader = new RomLoader(Config, GlobalWin.FirmwareManager) var loader = new RomLoader(Config)
{ {
ChooseArchive = LoadArchiveChooser, ChooseArchive = LoadArchiveChooser,
ChoosePlatform = ChoosePlatformForRom, ChoosePlatform = ChoosePlatformForRom,

2
src/BizHawk.Client.EmuHawk/tools/BatchRunner.cs
View File

@ -69,7 +69,7 @@ namespace BizHawk.Client.EmuHawk
_files = new List<string>(files); _files = new List<string>(files);
_numFrames = numFrames; _numFrames = numFrames;
_ldr = new RomLoader(GlobalWin.Config, GlobalWin.FirmwareManager); _ldr = new RomLoader(GlobalWin.Config);
_ldr.OnLoadError += OnLoadError; _ldr.OnLoadError += OnLoadError;
_ldr.ChooseArchive = ChooseArchive; _ldr.ChooseArchive = ChooseArchive;
_comm = comm; _comm = comm;