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

pass FirmwareManager into RomLoader instead of using Global

This commit is contained in:
adelikat 2020-06-06 14:55:26 -05:00
parent 364d551940
commit 981dc95c62
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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);

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

@ -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,

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

@ -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();