fix typo in Global property
This commit is contained in:
parent
67926a2de4
commit
edd8349dde
|
@ -38,8 +38,8 @@ namespace BizHawk.Client.Common
|
|||
LogCallback($"invalid mnemonic string: {inputLogEntry}");
|
||||
return;
|
||||
}
|
||||
foreach (var button in lg.Definition.BoolButtons) Global.ButtonOverrideAdaptor.SetButton(button, lg.IsPressed(button));
|
||||
foreach (var floatButton in lg.Definition.FloatControls) Global.ButtonOverrideAdaptor.SetFloat(floatButton, lg.GetFloat(floatButton));
|
||||
foreach (var button in lg.Definition.BoolButtons) Global.ButtonOverrideAdapter.SetButton(button, lg.IsPressed(button));
|
||||
foreach (var floatButton in lg.Definition.FloatControls) Global.ButtonOverrideAdapter.SetFloat(floatButton, lg.GetFloat(floatButton));
|
||||
}
|
||||
|
||||
public void Set(Dictionary<string, bool> buttons, int? controller = null)
|
||||
|
@ -55,9 +55,9 @@ namespace BizHawk.Client.Common
|
|||
try
|
||||
{
|
||||
var buttonToSet = controller == null ? button : $"P{controller} {button}";
|
||||
if (state == null) Global.ButtonOverrideAdaptor.UnSet(buttonToSet);
|
||||
else Global.ButtonOverrideAdaptor.SetButton(buttonToSet, state.Value);
|
||||
Global.ActiveController.Overrides(Global.ButtonOverrideAdaptor);
|
||||
if (state == null) Global.ButtonOverrideAdapter.UnSet(buttonToSet);
|
||||
else Global.ButtonOverrideAdapter.SetButton(buttonToSet, state.Value);
|
||||
Global.ActiveController.Overrides(Global.ButtonOverrideAdapter);
|
||||
}
|
||||
catch
|
||||
{
|
||||
|
|
|
@ -55,7 +55,7 @@ namespace BizHawk.Client.Common
|
|||
/// <summary>
|
||||
/// Used to AND to another controller, used for <see cref="JoypadApi.Set(Dictionary{string, bool}, int?)">JoypadApi.Set</see>
|
||||
/// </summary>
|
||||
public static OverrideAdapter ButtonOverrideAdaptor { get; } = new OverrideAdapter();
|
||||
public static OverrideAdapter ButtonOverrideAdapter { get; } = new OverrideAdapter();
|
||||
|
||||
/// <summary>
|
||||
/// fire off one-frame logical button clicks here. useful for things like ti-83 virtual pad and reset buttons
|
||||
|
|
|
@ -584,7 +584,7 @@ namespace BizHawk.Client.EmuHawk
|
|||
}
|
||||
|
||||
// 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)
|
||||
{
|
||||
|
@ -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
|
||||
ClickyVirtualPadController.FrameTick();
|
||||
Global.ButtonOverrideAdaptor.FrameTick();
|
||||
Global.ButtonOverrideAdapter.FrameTick();
|
||||
|
||||
if (Tools.Has<LuaConsole>() && !SuppressLua)
|
||||
{
|
||||
|
|
|
@ -785,7 +785,7 @@ namespace BizHawk.Client.EmuHawk
|
|||
foreach (var button in lg.Definition.BoolButtons)
|
||||
{
|
||||
// TODO: make an input adapter specifically for the bot?
|
||||
Global.ButtonOverrideAdaptor.SetButton(button, lg.IsPressed(button));
|
||||
Global.ButtonOverrideAdapter.SetButton(button, lg.IsPressed(button));
|
||||
}
|
||||
}
|
||||
else
|
||||
|
|
|
@ -32,12 +32,12 @@ namespace BizHawk.Client.EmuHawk
|
|||
|
||||
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)
|
||||
{
|
||||
Global.ButtonOverrideAdaptor.SetFloat(floatButton, lg.GetFloat(floatButton));
|
||||
Global.ButtonOverrideAdapter.SetFloat(floatButton, lg.GetFloat(floatButton));
|
||||
}
|
||||
|
||||
return lg;
|
||||
|
|
Loading…
Reference in New Issue