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

fix typo in Global property

This commit is contained in:
adelikat 2020-03-15 17:09:11 -05:00
parent 67926a2de4
commit edd8349dde
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
BizHawk.Client.Common/Api/Classes/JoypadApi.cs
View File

@ -38,8 +38,8 @@ namespace BizHawk.Client.Common
LogCallback($"invalid mnemonic string: {inputLogEntry}"); LogCallback($"invalid mnemonic string: {inputLogEntry}");
return; return;
} }
foreach (var button in lg.Definition.BoolButtons) Global.ButtonOverrideAdaptor.SetButton(button, lg.IsPressed(button)); foreach (var button in lg.Definition.BoolButtons) Global.ButtonOverrideAdapter.SetButton(button, lg.IsPressed(button));
foreach (var floatButton in lg.Definition.FloatControls) Global.ButtonOverrideAdaptor.SetFloat(floatButton, lg.GetFloat(floatButton)); foreach (var floatButton in lg.Definition.FloatControls) Global.ButtonOverrideAdapter.SetFloat(floatButton, lg.GetFloat(floatButton));
} }
public void Set(Dictionary<string, bool> buttons, int? controller = null) public void Set(Dictionary<string, bool> buttons, int? controller = null)
@ -55,9 +55,9 @@ namespace BizHawk.Client.Common
try try
{ {
var buttonToSet = controller == null ? button : $"P{controller} {button}"; var buttonToSet = controller == null ? button : $"P{controller} {button}";
if (state == null) Global.ButtonOverrideAdaptor.UnSet(buttonToSet); if (state == null) Global.ButtonOverrideAdapter.UnSet(buttonToSet);
else Global.ButtonOverrideAdaptor.SetButton(buttonToSet, state.Value); else Global.ButtonOverrideAdapter.SetButton(buttonToSet, state.Value);
Global.ActiveController.Overrides(Global.ButtonOverrideAdaptor); Global.ActiveController.Overrides(Global.ButtonOverrideAdapter);
} }
catch catch
{ {

2
BizHawk.Client.Common/Global.cs
View File

@ -55,7 +55,7 @@ namespace BizHawk.Client.Common
/// <summary> /// <summary>
/// Used to AND to another controller, used for <see cref="JoypadApi.Set(Dictionary{string, bool}, int?)">JoypadApi.Set</see> /// Used to AND to another controller, used for <see cref="JoypadApi.Set(Dictionary{string, bool}, int?)">JoypadApi.Set</see>
/// </summary> /// </summary>
public static OverrideAdapter ButtonOverrideAdaptor { get; } = new OverrideAdapter(); public static OverrideAdapter ButtonOverrideAdapter { get; } = new OverrideAdapter();
/// <summary> /// <summary>
/// fire off one-frame logical button clicks here. useful for things like ti-83 virtual pad and reset buttons /// fire off one-frame logical button clicks here. useful for things like ti-83 virtual pad and reset buttons

4
BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -584,7 +584,7 @@ namespace BizHawk.Client.EmuHawk
} }
// autohold/autofire must not be affected by the following inputs // autohold/autofire must not be affected by the following inputs
Global.ActiveController.Overrides(Global.ButtonOverrideAdaptor); Global.ActiveController.Overrides(Global.ButtonOverrideAdapter);
if (Tools.Has<LuaConsole>() && !SuppressLua) if (Tools.Has<LuaConsole>() && !SuppressLua)
{ {
@ -2902,7 +2902,7 @@ namespace BizHawk.Client.EmuHawk
// zero 03-may-2014 - moved this before call to UpdateToolsBefore(), since it seems to clear the state which a lua event.framestart is going to want to alter // zero 03-may-2014 - moved this before call to UpdateToolsBefore(), since it seems to clear the state which a lua event.framestart is going to want to alter
ClickyVirtualPadController.FrameTick(); ClickyVirtualPadController.FrameTick();
Global.ButtonOverrideAdaptor.FrameTick(); Global.ButtonOverrideAdapter.FrameTick();
if (Tools.Has<LuaConsole>() && !SuppressLua) if (Tools.Has<LuaConsole>() && !SuppressLua)
{ {

2
BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs
View File

@ -785,7 +785,7 @@ namespace BizHawk.Client.EmuHawk
foreach (var button in lg.Definition.BoolButtons) foreach (var button in lg.Definition.BoolButtons)
{ {
// TODO: make an input adapter specifically for the bot? // TODO: make an input adapter specifically for the bot?
Global.ButtonOverrideAdaptor.SetButton(button, lg.IsPressed(button)); Global.ButtonOverrideAdapter.SetButton(button, lg.IsPressed(button));
} }
} }
else else

4
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudioClipboard.cs
View File

@ -32,12 +32,12 @@ namespace BizHawk.Client.EmuHawk
foreach (var button in lg.Definition.BoolButtons) foreach (var button in lg.Definition.BoolButtons)
{ {
Global.ButtonOverrideAdaptor.SetButton(button, lg.IsPressed(button)); Global.ButtonOverrideAdapter.SetButton(button, lg.IsPressed(button));
} }
foreach (var floatButton in lg.Definition.FloatControls) foreach (var floatButton in lg.Definition.FloatControls)
{ {
Global.ButtonOverrideAdaptor.SetFloat(floatButton, lg.GetFloat(floatButton)); Global.ButtonOverrideAdapter.SetFloat(floatButton, lg.GetFloat(floatButton));
} }
return lg; return lg;