From 03acb1ded7cd1e971f77be438ec6542cb822ac8b Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Wed, 17 Jun 2020 01:03:47 +1000 Subject: [PATCH] Move LoadRomArgs to own file --- .../Api/Libraries/EmuClientApi.cs | 2 +- src/BizHawk.Client.EmuHawk/LoadRomArgs.cs | 10 ++++++++++ src/BizHawk.Client.EmuHawk/MainForm.cs | 6 ------ src/BizHawk.Client.EmuHawk/Program.cs | 2 +- .../tools/Lua/Libraries/ClientLuaLibrary.cs | 2 +- .../tools/MultiDiskBundler/MultiDiskBundler.cs | 2 +- 6 files changed, 14 insertions(+), 10 deletions(-) create mode 100644 src/BizHawk.Client.EmuHawk/LoadRomArgs.cs diff --git a/src/BizHawk.Client.EmuHawk/Api/Libraries/EmuClientApi.cs b/src/BizHawk.Client.EmuHawk/Api/Libraries/EmuClientApi.cs index d338b6a9f2..dfd8826b61 100644 --- a/src/BizHawk.Client.EmuHawk/Api/Libraries/EmuClientApi.cs +++ b/src/BizHawk.Client.EmuHawk/Api/Libraries/EmuClientApi.cs @@ -234,7 +234,7 @@ namespace BizHawk.Client.EmuHawk public void OnStateSaved(object sender, string stateName) => StateSaved?.Invoke(sender, new StateSavedEventArgs(stateName)); - public void OpenRom(string path) => _mainForm.LoadRom(path, new MainForm.LoadRomArgs { OpenAdvanced = OpenAdvancedSerializer.ParseWithLegacy(path) }); + public void OpenRom(string path) => _mainForm.LoadRom(path, new LoadRomArgs { OpenAdvanced = OpenAdvancedSerializer.ParseWithLegacy(path) }); public void Pause() => _mainForm.PauseEmulator(); diff --git a/src/BizHawk.Client.EmuHawk/LoadRomArgs.cs b/src/BizHawk.Client.EmuHawk/LoadRomArgs.cs new file mode 100644 index 0000000000..88dcb968d3 --- /dev/null +++ b/src/BizHawk.Client.EmuHawk/LoadRomArgs.cs @@ -0,0 +1,10 @@ +using BizHawk.Client.Common; + +namespace BizHawk.Client.EmuHawk +{ + public class LoadRomArgs + { + public bool? Deterministic { get; set; } + public IOpenAdvanced OpenAdvanced { get; set; } + } +} diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs index cb1f52fb90..611b5e12c8 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.cs @@ -3556,12 +3556,6 @@ namespace BizHawk.Client.EmuHawk return platformChooser.PlatformChoice; } - public class LoadRomArgs - { - public bool? Deterministic { get; set; } - public IOpenAdvanced OpenAdvanced { get; set; } - } - private LoadRomArgs _currentLoadRomArgs; public bool LoadRom(string path, LoadRomArgs args) diff --git a/src/BizHawk.Client.EmuHawk/Program.cs b/src/BizHawk.Client.EmuHawk/Program.cs index c10c73108e..14f9dfece0 100644 --- a/src/BizHawk.Client.EmuHawk/Program.cs +++ b/src/BizHawk.Client.EmuHawk/Program.cs @@ -325,7 +325,7 @@ namespace BizHawk.Client.EmuHawk private void this_StartupNextInstance(object sender, StartupNextInstanceEventArgs e) { if (e.CommandLine.Count >= 1) - ((MainForm)MainForm).LoadRom(e.CommandLine[0], new MainForm.LoadRomArgs { OpenAdvanced = new OpenAdvanced_OpenRom() }); + ((MainForm)MainForm).LoadRom(e.CommandLine[0], new LoadRomArgs { OpenAdvanced = new OpenAdvanced_OpenRom() }); } protected override void OnCreateMainForm() diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/Libraries/ClientLuaLibrary.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/Libraries/ClientLuaLibrary.cs index 5e324261e4..e0c2320a6b 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Lua/Libraries/ClientLuaLibrary.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Lua/Libraries/ClientLuaLibrary.cs @@ -231,7 +231,7 @@ namespace BizHawk.Client.EmuHawk public void OpenRom(string path) { var ioa = OpenAdvancedSerializer.ParseWithLegacy(path); - MainForm.LoadRom(path, new MainForm.LoadRomArgs { OpenAdvanced = ioa }); + MainForm.LoadRom(path, new LoadRomArgs { OpenAdvanced = ioa }); } [LuaMethodExample("client.opentasstudio( );")] diff --git a/src/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.cs b/src/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.cs index 64875bc8ba..664f11c326 100644 --- a/src/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.cs +++ b/src/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.cs @@ -90,7 +90,7 @@ namespace BizHawk.Client.EmuHawk DialogResult = DialogResult.OK; Close(); - var lra = new MainForm.LoadRomArgs { OpenAdvanced = new OpenAdvanced_OpenRom { Path = fileInfo.FullName } }; + var lra = new LoadRomArgs { OpenAdvanced = new OpenAdvanced_OpenRom { Path = fileInfo.FullName } }; MainForm.LoadRom(fileInfo.FullName, lra); } }