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

Don't use Global.Emulator in MacroInput.ButtonSelect

This commit is contained in:
adelikat 2020-01-03 14:12:13 -06:00
parent ba68a307df
commit 6183d6e3a6
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BizHawk.Client.EmuHawk/tools/Macros/MacroInput.ButtonSelect.cs
View File

@ -1,8 +1,6 @@
using System;
using System.Drawing;
using System.Windows.Forms;
using BizHawk.Emulation.Common;
using BizHawk.Client.Common;
namespace BizHawk.Client.EmuHawk
@ -12,18 +10,18 @@ namespace BizHawk.Client.EmuHawk
private CheckBox[] _buttonBoxes;
private void SetUpButtonBoxes()
{
ControllerDefinition def = Global.Emulator.ControllerDefinition;
var def = Emulator.ControllerDefinition;
int count = def.BoolButtons.Count + def.FloatControls.Count;
_buttonBoxes = new CheckBox[count];
for (int i = 0; i < def.FloatControls.Count; i++)
{
CheckBox box = new CheckBox {Text = def.FloatControls[i]};
var box = new CheckBox { Text = def.FloatControls[i] };
_buttonBoxes[i] = box;
}
for (int i = 0; i < def.BoolButtons.Count; i++)
{
CheckBox box = new CheckBox {Text = def.BoolButtons[i]};
var box = new CheckBox { Text = def.BoolButtons[i] };
_buttonBoxes[i + def.FloatControls.Count] = box;
}