From 04aa023cb9f294dd6ea046641eb76e1f2a92997e Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Tue, 22 Apr 2014 21:55:04 +0000
Subject: [PATCH] Fix joypad.Set() when using the controller number parameter,
 also strongly type that parameter to nullable int instead of object, add a
 unit test lua script that tests for this

---
 .../lua/EmuLuaLibrary.Joypad.cs               | 12 ++---
 output/Lua/UnitTests/Joypad_Set.lua           | 30 ++++++-------
 .../Joypad_WithControllerNumbers.lua          | 44 +++++++++++++++++++
 output/Lua/UnitTests/UnitTests.luases         |  1 +
 4 files changed, 66 insertions(+), 21 deletions(-)
 create mode 100644 output/Lua/UnitTests/Joypad_WithControllerNumbers.lua

diff --git a/BizHawk.Client.Common/lua/EmuLuaLibrary.Joypad.cs b/BizHawk.Client.Common/lua/EmuLuaLibrary.Joypad.cs
index ab56e20875..ebe1df0ff5 100644
--- a/BizHawk.Client.Common/lua/EmuLuaLibrary.Joypad.cs
+++ b/BizHawk.Client.Common/lua/EmuLuaLibrary.Joypad.cs
@@ -71,7 +71,7 @@ namespace BizHawk.Client.Common
 			"set",
 			"sets the given buttons to their provided values for the current frame"
 		)]
-		public void Set(LuaTable buttons, object controller = null)
+		public void Set(LuaTable buttons, int? controller = null)
 		{
 			try
 			{
@@ -102,8 +102,8 @@ namespace BizHawk.Client.Common
 						theValue = null;
 					}
 
-					var toPress = button;
-					if (controller != null)
+					var toPress = button.ToString();
+					if (controller.HasValue)
 					{
 						toPress = "P" + controller + " " + button;
 					}
@@ -112,16 +112,16 @@ namespace BizHawk.Client.Common
 					{
 						if (theValue.HasValue) // Force
 						{
-							Global.LuaAndAdaptor.SetButton(button.ToString(), theValue.Value);
+							Global.LuaAndAdaptor.SetButton(toPress, theValue.Value);
 						}
 						else // Unset
 						{
-							Global.LuaAndAdaptor.UnSet(button.ToString());
+							Global.LuaAndAdaptor.UnSet(toPress);
 						}
 					}
 					else // Inverse
 					{
-						Global.LuaAndAdaptor.SetInverse(button.ToString());
+						Global.LuaAndAdaptor.SetInverse(toPress);
 					}
 				}
 			}
diff --git a/output/Lua/UnitTests/Joypad_Set.lua b/output/Lua/UnitTests/Joypad_Set.lua
index d90c06cf3b..60baa6011e 100644
--- a/output/Lua/UnitTests/Joypad_Set.lua
+++ b/output/Lua/UnitTests/Joypad_Set.lua
@@ -10,33 +10,33 @@ console.log("After frame 600, the console will say 'cleared', and now all button
 
 buttons = { };
 
-buttons["P1 Up"] = false;
-buttons["P1 Down"] = true;
-buttons["P1 Left"] = "invert";
-buttons["P1 Right"] = null;
-joypad.set(buttons);
+buttons["Up"] = false;
+buttons["Down"] = true;
+buttons["Left"] = "invert";
+buttons["Right"] = null;
+joypad.set(buttons, 1);
 
 pushThings = true;	
 
 while true do
 	if (pushThings) then
 		buttons = { };
-		buttons["P1 A"] = false;
-		buttons["P1 B"] = true;
-		buttons["P1 Select"] = "invert";
-		buttons["P1 Start"] = null;
-		joypad.set(buttons);
+		buttons["A"] = false;
+		buttons["B"] = true;
+		buttons["Select"] = "invert";
+		buttons["Start"] = null;
+		joypad.set(buttons, 1);
 	end
 	
 	if (emu.framecount() == 600) then
 		pushThings = false;
 		turnoff = { };
-		turnoff["P1 A"] = null;
-		turnoff["P1 B"] = null;
-		turnoff["P1 Select"] = null;
-		turnoff["P1 Start"] = null;
+		turnoff["A"] = null;
+		turnoff["B"] = null;
+		turnoff["Select"] = null;
+		turnoff["Start"] = null;
 		
-		joypad.set(turnoff);
+		joypad.set(turnoff, 1);
 		console.log("cleared")
 	end
 	
diff --git a/output/Lua/UnitTests/Joypad_WithControllerNumbers.lua b/output/Lua/UnitTests/Joypad_WithControllerNumbers.lua
new file mode 100644
index 0000000000..7949849468
--- /dev/null
+++ b/output/Lua/UnitTests/Joypad_WithControllerNumbers.lua
@@ -0,0 +1,44 @@
+console.log("Unit test for joypad.set using the controller parameter")
+console.log("Core Required: NES (or any multi-player core with U,D,L,R,select,start,A,B as buttons)")
+console.log("Correct behavior:")
+console.log("No Directional button shoudl be imparied in any way, should operate as if nothing was ever pressed")
+console.log("A should be off and user can not push buttons to change that")
+console.log("B should be on and the user can not push buttons to change that")
+console.log("Select should be on, but pressing it turns it off")
+console.log("Start should be unaffected")
+console.log("After frame 600, the console will say 'cleared', and now all buttons should be off and unaffected, as if the script was never run");
+
+buttons = { };
+
+buttons["Up"] = false;
+buttons["Down"] = true;
+buttons["Left"] = "invert";
+buttons["Right"] = null;
+joypad.set(buttons, 1);
+
+pushThings = true;	
+
+while true do
+	if (pushThings) then
+		buttons = { };
+		buttons["A"] = false;
+		buttons["B"] = true;
+		buttons["Select"] = "invert";
+		buttons["Start"] = null;
+		joypad.set(buttons, 1);
+	end
+	
+	if (emu.framecount() == 600) then
+		pushThings = false;
+		turnoff = { };
+		turnoff["A"] = null;
+		turnoff["B"] = null;
+		turnoff["Select"] = null;
+		turnoff["Start"] = null;
+		
+		joypad.set(turnoff, 1);
+		console.log("cleared")
+	end
+	
+	emu.frameadvance();
+end
\ No newline at end of file
diff --git a/output/Lua/UnitTests/UnitTests.luases b/output/Lua/UnitTests/UnitTests.luases
index 0c88c4c2a9..e6926008c6 100644
--- a/output/Lua/UnitTests/UnitTests.luases
+++ b/output/Lua/UnitTests/UnitTests.luases
@@ -1,2 +1,3 @@
 0 .\Lua\UnitTests\Joypad_Set.lua
+0 .\Lua\UnitTests\Joypad_WithControllerNumbers.lua
 0 .\Lua\UnitTests\GameInfo.lua