From ef366771683c35b81f7c302525b6812b7160a452 Mon Sep 17 00:00:00 2001 From: pjgat09 Date: Mon, 5 Aug 2013 02:38:45 +0000 Subject: [PATCH] N64: Fix input display on the virtual pad --- BizHawk.MultiClient/tools/VirtualPadForm.cs | 8 ++++---- BizHawk.MultiClient/tools/VirtualPadN64.cs | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/BizHawk.MultiClient/tools/VirtualPadForm.cs b/BizHawk.MultiClient/tools/VirtualPadForm.cs index 199ef49055..6395c1eb3c 100644 --- a/BizHawk.MultiClient/tools/VirtualPadForm.cs +++ b/BizHawk.MultiClient/tools/VirtualPadForm.cs @@ -295,10 +295,10 @@ namespace BizHawk.MultiClient case "C64": break; case "N64": - Pads[0].SetButtons(str.Substring(3, 20)); - Pads[1].SetButtons(str.Substring(24, 20)); - Pads[2].SetButtons(str.Substring(45, 20)); - Pads[3].SetButtons(str.Substring(66, 20)); + Pads[0].SetButtons(str.Substring(3, 23)); + Pads[1].SetButtons(str.Substring(27, 23)); + Pads[2].SetButtons(str.Substring(51, 23)); + Pads[3].SetButtons(str.Substring(75, 23)); break; } } diff --git a/BizHawk.MultiClient/tools/VirtualPadN64.cs b/BizHawk.MultiClient/tools/VirtualPadN64.cs index 8986112955..0c87fe933f 100644 --- a/BizHawk.MultiClient/tools/VirtualPadN64.cs +++ b/BizHawk.MultiClient/tools/VirtualPadN64.cs @@ -112,16 +112,16 @@ namespace BizHawk.MultiClient int x = 0; int y = 0; - if (InputValidate.IsValidUnsignedNumber(buttons.Substring(14, 3))) + if (InputValidate.IsValidSignedNumber(buttons.Substring(14, 4))) { - x = Int32.Parse(buttons.Substring(14, 3)) - 128; + x = Int32.Parse(buttons.Substring(14, 4)); } - if (InputValidate.IsValidUnsignedNumber(buttons.Substring(17, 3))) + if (InputValidate.IsValidSignedNumber(buttons.Substring(19, 4))) { - y = Int32.Parse(buttons.Substring(17, 3)) - 128; + y = Int32.Parse(buttons.Substring(19, 4)); } - AnalogControl1.SetPosition(x, y); + set_analog(x, y); } public string GetMnemonic()