From 6f296a5773dfdc9c28db8a4b1d74300b639f24e6 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Wed, 21 May 2014 03:25:41 +0000
Subject: [PATCH] Lua - joypad.setfrommnemonicstr() - support the notion of
 pressing the analog stick for 1 frame, rather than sticky behavior

---
 BizHawk.Client.Common/ControllerBinding.cs    |  5 ++++
 .../lua/EmuLuaLibrary.Joypad.cs               |  2 +-
 BizHawk.Client.Common/movie/InputAdapters.cs  | 30 +++++++++++++++++++
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/BizHawk.Client.Common/ControllerBinding.cs b/BizHawk.Client.Common/ControllerBinding.cs
index 58461651b5..34e56cfc20 100644
--- a/BizHawk.Client.Common/ControllerBinding.cs
+++ b/BizHawk.Client.Common/ControllerBinding.cs
@@ -163,6 +163,11 @@ namespace BizHawk.Client.Common
 				_buttons[button] = controller[button];
 			}
 
+			foreach (var button in controller.FloatOverrides)
+			{
+				_floatButtons[button] = controller.GetFloat(button);
+			}
+
 			foreach (var button in controller.InversedButtons)
 			{
 				_buttons[button] ^= true;
diff --git a/BizHawk.Client.Common/lua/EmuLuaLibrary.Joypad.cs b/BizHawk.Client.Common/lua/EmuLuaLibrary.Joypad.cs
index 352e7ef588..53b603c152 100644
--- a/BizHawk.Client.Common/lua/EmuLuaLibrary.Joypad.cs
+++ b/BizHawk.Client.Common/lua/EmuLuaLibrary.Joypad.cs
@@ -82,7 +82,7 @@ namespace BizHawk.Client.Common
 
 			foreach (var floatButton in m.Type.FloatControls)
 			{
-				Global.StickyXORAdapter.SetFloat(floatButton, m.GetFloat(floatButton));
+				Global.LuaAndAdaptor.SetFloat(floatButton, m.GetFloat(floatButton));
 			}
 		}
 
diff --git a/BizHawk.Client.Common/movie/InputAdapters.cs b/BizHawk.Client.Common/movie/InputAdapters.cs
index 77d474ffab..fc378ddd2d 100644
--- a/BizHawk.Client.Common/movie/InputAdapters.cs
+++ b/BizHawk.Client.Common/movie/InputAdapters.cs
@@ -665,6 +665,7 @@ namespace BizHawk.Client.Common
 	public class OverrideAdaptor : IController
 	{
 		private readonly Dictionary<string, bool> _overrides = new Dictionary<string, bool>();
+		private readonly Dictionary<string, float> _floatOverrides = new Dictionary<string, float>();
 		private readonly List<string> _inverses = new List<string>();
 
 		public bool this[string button]
@@ -705,6 +706,17 @@ namespace BizHawk.Client.Common
 			}
 		}
 
+		public IEnumerable<string> FloatOverrides
+		{
+			get
+			{
+				foreach (var kvp in _floatOverrides)
+				{
+					yield return kvp.Key;
+				}
+			}
+		}
+
 		public IEnumerable<string> InversedButtons
 		{
 			get
@@ -716,8 +728,25 @@ namespace BizHawk.Client.Common
 			}
 		}
 
+		public void SetFloat(string name, float value)
+		{
+			if (_floatOverrides.ContainsKey(name))
+			{
+				_floatOverrides[name] = value;
+			}
+			else
+			{
+				_floatOverrides.Add(name, value);
+			}
+		}
+
 		public float GetFloat(string name)
 		{
+			if (_floatOverrides.ContainsKey(name))
+			{
+				return _floatOverrides[name];
+			}
+
 			return 0.0F;
 		}
 
@@ -743,6 +772,7 @@ namespace BizHawk.Client.Common
 		public void FrameTick()
 		{
 			_overrides.Clear();
+			_floatOverrides.Clear();
 			_inverses.Clear();
 		}
 	}