From 5ffc26b5e968d5a613a5f04b97dfadc56cc52c52 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sun, 17 May 2020 11:59:24 -0500 Subject: [PATCH] AutoFireStickyXorAdapter - pass in on/off instead of getting them directly from Global.Config --- src/BizHawk.Client.Common/inputAdapters/StickyAdapters.cs | 6 +++--- src/BizHawk.Client.EmuHawk/MainForm.cs | 2 +- src/BizHawk.Client.EmuHawk/config/AutofireConfig.cs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/BizHawk.Client.Common/inputAdapters/StickyAdapters.cs b/src/BizHawk.Client.Common/inputAdapters/StickyAdapters.cs index 40d9de31b1..8df5667cae 100644 --- a/src/BizHawk.Client.Common/inputAdapters/StickyAdapters.cs +++ b/src/BizHawk.Client.Common/inputAdapters/StickyAdapters.cs @@ -146,10 +146,10 @@ namespace BizHawk.Client.Common private int _on; private int _off; - public void SetOnOffPatternFromConfig() + public void SetOnOffPatternFromConfig(int on, int off) { - _on = Global.Config.AutofireOn < 1 ? 0 : Global.Config.AutofireOn; - _off = Global.Config.AutofireOff < 1 ? 0 : Global.Config.AutofireOff; + _on = on < 0 ? 0 : on; + _off = off < 0 ? 0 : off; } private readonly WorkingDictionary _boolPatterns = new WorkingDictionary(); diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs index 3c9a23e8ee..d19ad42652 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.cs @@ -319,7 +319,7 @@ namespace BizHawk.Client.EmuHawk Global.InputManager.ActiveController = new Controller(NullController.Instance.Definition); Global.InputManager.AutoFireController = _autofireNullControls; - Global.InputManager.AutofireStickyXorAdapter.SetOnOffPatternFromConfig(); + Global.InputManager.AutofireStickyXorAdapter.SetOnOffPatternFromConfig(Config.AutofireOn, Config.AutofireOff); try { GlobalWin.Sound = new Sound(Handle); diff --git a/src/BizHawk.Client.EmuHawk/config/AutofireConfig.cs b/src/BizHawk.Client.EmuHawk/config/AutofireConfig.cs index d7fb2b783e..56b975a9bf 100644 --- a/src/BizHawk.Client.EmuHawk/config/AutofireConfig.cs +++ b/src/BizHawk.Client.EmuHawk/config/AutofireConfig.cs @@ -57,7 +57,7 @@ namespace BizHawk.Client.EmuHawk _autoFireController.On = _config.AutofireOn = (int)nudPatternOn.Value; _autoFireController.Off = _config.AutofireOff = (int)nudPatternOff.Value; _config.AutofireLagFrames = cbConsiderLag.Checked; - _stickyXorAdapter.SetOnOffPatternFromConfig(); + _stickyXorAdapter.SetOnOffPatternFromConfig(_config.AutofireOn, _config.AutofireOff); Close(); }