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

Changed the timing of merging Lua input to controllers. Now joypad.set stops altering autohold/autofire buttons.

This commit is contained in:
gochaism 2014-08-12 23:55:03 +00:00
parent 957e882e2d
commit d729403cca
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -479,7 +479,6 @@ namespace BizHawk.Client.EmuHawk
(Global.Emulator is N64 && Global.Config.N64UseCircularAnalogConstraint) ? "Natural Circle" : null);
Global.ActiveController.OR_FromLogical(Global.ClickyVirtualPadController);
Global.ActiveController.Overrides(Global.LuaAndAdaptor);
Global.AutoFireController.LatchFromPhysical(Global.ControllerInputCoalescer);
if (Global.ClientControls["Autohold"])
@ -492,6 +491,9 @@ namespace BizHawk.Client.EmuHawk
Global.AutofireStickyXORAdapter.MassToggleStickyState(Global.ActiveController.PressedButtons);
}
// autohold/autofire must not be affected by the following inputs
Global.ActiveController.Overrides(Global.LuaAndAdaptor);
if (GlobalWin.Tools.Has<LuaConsole>())
{
GlobalWin.Tools.LuaConsole.ResumeScripts(false);