From 3303652d991d0502fa26ad88718cda997448a274 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sat, 16 Aug 2014 14:33:09 +0000 Subject: [PATCH] On loadstate clear "button start" values in the autofire logic --- BizHawk.Client.Common/ControllerBinding.cs | 5 +++++ BizHawk.Client.EmuHawk/MainForm.cs | 1 + 2 files changed, 6 insertions(+) diff --git a/BizHawk.Client.Common/ControllerBinding.cs b/BizHawk.Client.Common/ControllerBinding.cs index 16e58dc971..cc365d7cea 100644 --- a/BizHawk.Client.Common/ControllerBinding.cs +++ b/BizHawk.Client.Common/ControllerBinding.cs @@ -248,6 +248,11 @@ namespace BizHawk.Client.Common return _buttons[button]; } + public void ClearStarts() + { + _buttonStarts.Clear(); + } + public float GetFloat(string name) { throw new NotImplementedException(); } // look for bindings which are activated by the supplied physical button. diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs index ef29f795f5..127c1de39b 100644 --- a/BizHawk.Client.EmuHawk/MainForm.cs +++ b/BizHawk.Client.EmuHawk/MainForm.cs @@ -2382,6 +2382,7 @@ namespace BizHawk.Client.EmuHawk GlobalWin.Tools.UpdateToolsBefore(fromLua); UpdateToolsAfter(fromLua); UpdateToolsLoadstate(); + Global.AutoFireController.ClearStarts(); GlobalWin.OSD.AddMessage("Loaded state: " + userFriendlyStateName); if (GlobalWin.Tools.Has())