From 81fe6e200cde21f1c4936755717575209a721f4c Mon Sep 17 00:00:00 2001 From: "andres.delikat" Date: Tue, 26 Jul 2011 02:47:21 +0000 Subject: [PATCH] TAStudio - Fix SMS virtualpad so that it controls input --- BizHawk.MultiClient/tools/TAStudio.Designer.cs | 3 ++- BizHawk.MultiClient/tools/TAStudio.cs | 2 ++ BizHawk.MultiClient/tools/VirtualPadSMS.cs | 12 ++++++------ 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/BizHawk.MultiClient/tools/TAStudio.Designer.cs b/BizHawk.MultiClient/tools/TAStudio.Designer.cs index 1e6396a109..653d382877 100644 --- a/BizHawk.MultiClient/tools/TAStudio.Designer.cs +++ b/BizHawk.MultiClient/tools/TAStudio.Designer.cs @@ -242,7 +242,7 @@ this.StopButton}); this.toolStrip1.Location = new System.Drawing.Point(37, 27); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(154, 25); + this.toolStrip1.Size = new System.Drawing.Size(185, 25); this.toolStrip1.TabIndex = 0; // // RewindToBeginning @@ -292,6 +292,7 @@ // FastFowardToEnd // this.FastFowardToEnd.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.FastFowardToEnd.Enabled = false; this.FastFowardToEnd.Image = global::BizHawk.MultiClient.Properties.Resources.ForwardMore; this.FastFowardToEnd.ImageTransparentColor = System.Drawing.Color.Magenta; this.FastFowardToEnd.Name = "FastFowardToEnd"; diff --git a/BizHawk.MultiClient/tools/TAStudio.cs b/BizHawk.MultiClient/tools/TAStudio.cs index 20ac070905..dbd456e4a0 100644 --- a/BizHawk.MultiClient/tools/TAStudio.cs +++ b/BizHawk.MultiClient/tools/TAStudio.cs @@ -121,8 +121,10 @@ namespace BizHawk.MultiClient case "GG": VirtualPadSMS smspad1 = new VirtualPadSMS(); smspad1.Location = new Point(8, 19); + smspad1.Controller = "P1"; VirtualPadSMS smspad2 = new VirtualPadSMS(); smspad2.Location = new Point(188, 19); + smspad2.Controller = "P2"; Pads.Add(smspad1); Pads.Add(smspad2); ControllerBox.Controls.Add(Pads[0]); diff --git a/BizHawk.MultiClient/tools/VirtualPadSMS.cs b/BizHawk.MultiClient/tools/VirtualPadSMS.cs index c4ba26e3b6..7af88a233f 100644 --- a/BizHawk.MultiClient/tools/VirtualPadSMS.cs +++ b/BizHawk.MultiClient/tools/VirtualPadSMS.cs @@ -148,17 +148,17 @@ namespace BizHawk.MultiClient { if (Global.Emulator.SystemId != "SMS") return; if (sender == PU) - Global.StickyXORAdapter.SetSticky(Controller + "Up", PU.Checked); + Global.StickyXORAdapter.SetSticky(Controller + " Up", PU.Checked); else if (sender == PD) - Global.StickyXORAdapter.SetSticky(Controller + "Down", PD.Checked); + Global.StickyXORAdapter.SetSticky(Controller + " Down", PD.Checked); else if (sender == PL) - Global.StickyXORAdapter.SetSticky(Controller + "Left", PL.Checked); + Global.StickyXORAdapter.SetSticky(Controller + " Left", PL.Checked); else if (sender == PR) - Global.StickyXORAdapter.SetSticky(Controller + "Right", PR.Checked); + Global.StickyXORAdapter.SetSticky(Controller + " Right", PR.Checked); else if (sender == B1) - Global.StickyXORAdapter.SetSticky(Controller + "B1", B3.Checked); + Global.StickyXORAdapter.SetSticky(Controller + " B1", B3.Checked); else if (sender == B2) - Global.StickyXORAdapter.SetSticky(Controller + "B2", B4.Checked); + Global.StickyXORAdapter.SetSticky(Controller + " B2", B4.Checked); } public override void Clear()