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

AutoFireStickyXorAdapter - pass in on/off instead of getting them directly from Global.Config

This commit is contained in:
adelikat 2020-05-17 11:59:24 -05:00
parent c91b17877d
commit 5ffc26b5e9
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/BizHawk.Client.Common/inputAdapters/StickyAdapters.cs
View File

@ -146,10 +146,10 @@ namespace BizHawk.Client.Common
private int _on; private int _on;
private int _off; private int _off;
public void SetOnOffPatternFromConfig() public void SetOnOffPatternFromConfig(int on, int off)
{ {
_on = Global.Config.AutofireOn < 1 ? 0 : Global.Config.AutofireOn; _on = on < 0 ? 0 : on;
_off = Global.Config.AutofireOff < 1 ? 0 : Global.Config.AutofireOff; _off = off < 0 ? 0 : off;
} }
private readonly WorkingDictionary<string, AutoPatternBool> _boolPatterns = new WorkingDictionary<string, AutoPatternBool>(); private readonly WorkingDictionary<string, AutoPatternBool> _boolPatterns = new WorkingDictionary<string, AutoPatternBool>();

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

@ -319,7 +319,7 @@ namespace BizHawk.Client.EmuHawk
Global.InputManager.ActiveController = new Controller(NullController.Instance.Definition); Global.InputManager.ActiveController = new Controller(NullController.Instance.Definition);
Global.InputManager.AutoFireController = _autofireNullControls; Global.InputManager.AutoFireController = _autofireNullControls;
Global.InputManager.AutofireStickyXorAdapter.SetOnOffPatternFromConfig(); Global.InputManager.AutofireStickyXorAdapter.SetOnOffPatternFromConfig(Config.AutofireOn, Config.AutofireOff);
try try
{ {
GlobalWin.Sound = new Sound(Handle); GlobalWin.Sound = new Sound(Handle);

2
src/BizHawk.Client.EmuHawk/config/AutofireConfig.cs
View File

@ -57,7 +57,7 @@ namespace BizHawk.Client.EmuHawk
_autoFireController.On = _config.AutofireOn = (int)nudPatternOn.Value; _autoFireController.On = _config.AutofireOn = (int)nudPatternOn.Value;
_autoFireController.Off = _config.AutofireOff = (int)nudPatternOff.Value; _autoFireController.Off = _config.AutofireOff = (int)nudPatternOff.Value;
_config.AutofireLagFrames = cbConsiderLag.Checked; _config.AutofireLagFrames = cbConsiderLag.Checked;
_stickyXorAdapter.SetOnOffPatternFromConfig(); _stickyXorAdapter.SetOnOffPatternFromConfig(_config.AutofireOn, _config.AutofireOff);
Close(); Close();
} }