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

Autofire Config - pass in dependencies

This commit is contained in:
adelikat 2019-12-16 18:22:41 -06:00
parent 88830fad4c
commit 7d961c34f1
2 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -1005,8 +1005,11 @@ namespace BizHawk.Client.EmuHawk
private void AutofireMenuItem_Click(object sender, EventArgs e)
{
using var form = new AutofireConfig();
form.ShowDialog();
using var form = new AutofireConfig(Global.Config, Global.AutoFireController, Global.AutofireStickyXORAdapter);
var result = form.ShowDialog();
AddOnScreenMessage(result == DialogResult.OK
? "Autofire settings saved"
: "Autofire config aborted");
}
private void RewindOptionsMenuItem_Click(object sender, EventArgs e)

37
BizHawk.Client.EmuHawk/config/AutofireConfig.cs
View File

@ -1,62 +1,69 @@
using System;
using System.Windows.Forms;
using BizHawk.Client.Common;
namespace BizHawk.Client.EmuHawk
{
public partial class AutofireConfig : Form
{
public AutofireConfig()
private readonly Config _config;
private readonly AutofireController _autoFireController;
private readonly AutoFireStickyXorAdapter _stickyXorAdapter;
public AutofireConfig(
Config config,
AutofireController autoFireController,
AutoFireStickyXorAdapter stickyXorAdapter)
{
_config = config;
_autoFireController = autoFireController;
_stickyXorAdapter = stickyXorAdapter;
InitializeComponent();
}
private void AutofireConfig_Load(object sender, EventArgs e)
{
if (Global.Config.AutofireOn < OnNumeric.Minimum)
if (_config.AutofireOn < OnNumeric.Minimum)
{
OnNumeric.Value = OnNumeric.Minimum;
}
else if (Global.Config.AutofireOn > OnNumeric.Maximum)
else if (_config.AutofireOn > OnNumeric.Maximum)
{
OnNumeric.Value = OnNumeric.Maximum;
}
else
{
OnNumeric.Value = Global.Config.AutofireOn;
OnNumeric.Value = _config.AutofireOn;
}
if (Global.Config.AutofireOff < OffNumeric.Minimum)
if (_config.AutofireOff < OffNumeric.Minimum)
{
OffNumeric.Value = OffNumeric.Minimum;
}
else if (Global.Config.AutofireOff > OffNumeric.Maximum)
else if (_config.AutofireOff > OffNumeric.Maximum)
{
OffNumeric.Value = OffNumeric.Maximum;
}
else
{
OffNumeric.Value = Global.Config.AutofireOff;
OffNumeric.Value = _config.AutofireOff;
}
LagFrameCheck.Checked = Global.Config.AutofireLagFrames;
LagFrameCheck.Checked = _config.AutofireLagFrames;
}
private void Ok_Click(object sender, EventArgs e)
{
Global.AutoFireController.On = Global.Config.AutofireOn = (int)OnNumeric.Value;
Global.AutoFireController.Off = Global.Config.AutofireOff = (int)OffNumeric.Value;
Global.Config.AutofireLagFrames = LagFrameCheck.Checked;
Global.AutofireStickyXORAdapter.SetOnOffPatternFromConfig();
_autoFireController.On = _config.AutofireOn = (int)OnNumeric.Value;
_autoFireController.Off = _config.AutofireOff = (int)OffNumeric.Value;
_config.AutofireLagFrames = LagFrameCheck.Checked;
_stickyXorAdapter.SetOnOffPatternFromConfig();
GlobalWin.OSD.AddMessage("Autofire settings saved");
Close();
}
private void Cancel_Click(object sender, EventArgs e)
{
GlobalWin.OSD.AddMessage("Autofire config aborted");
Close();
}
}