From 7ac6c1ce6c3901d16a6d284b5400833de986da6e Mon Sep 17 00:00:00 2001 From: adelikat Date: Sun, 18 Nov 2012 22:34:38 +0000 Subject: [PATCH] C64 - Virtualpads - add the 2 joysticks --- BizHawk.MultiClient/tools/VirtualPadA26.cs | 2 +- BizHawk.MultiClient/tools/VirtualPadForm.cs | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/BizHawk.MultiClient/tools/VirtualPadA26.cs b/BizHawk.MultiClient/tools/VirtualPadA26.cs index 69fe4fc1cc..470f927b42 100644 --- a/BizHawk.MultiClient/tools/VirtualPadA26.cs +++ b/BizHawk.MultiClient/tools/VirtualPadA26.cs @@ -136,7 +136,7 @@ namespace BizHawk.MultiClient private void Buttons_CheckedChanged(object sender, EventArgs e) { - if (Global.Emulator.SystemId != "A26") return; + if (Global.Emulator.SystemId != "A26" && Global.Emulator.SystemId != "C64") return; if (sender == PU) Global.StickyXORAdapter.SetSticky(Controller + " Up", PU.Checked); else if (sender == PD) diff --git a/BizHawk.MultiClient/tools/VirtualPadForm.cs b/BizHawk.MultiClient/tools/VirtualPadForm.cs index 644245753f..808b649801 100644 --- a/BizHawk.MultiClient/tools/VirtualPadForm.cs +++ b/BizHawk.MultiClient/tools/VirtualPadForm.cs @@ -183,6 +183,17 @@ namespace BizHawk.MultiClient c64k.Location = new Point(8, 19); Pads.Add(c64k); ControllerBox.Controls.Add(c64k); + + VirtualPadA26 _ataripad1 = new VirtualPadA26(); + _ataripad1.Location = new Point(8, 159); + _ataripad1.Controller = "P1"; + VirtualPadA26 _ataripad2 = new VirtualPadA26(); + _ataripad2.Location = new Point(188, 159); + _ataripad2.Controller = "P2"; + Pads.Add(_ataripad1); + Pads.Add(_ataripad2); + ControllerBox.Controls.Add(_ataripad1); + ControllerBox.Controls.Add(_ataripad2); break; } }