diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadTool.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadTool.cs index 28988b9ed6..417e268d8a 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadTool.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadTool.cs @@ -90,11 +90,7 @@ namespace BizHawk.Client.EmuHawk }); break; case "PCE": - ControllerBox.Controls.Add(new VirtualPad( - PceSchema.StandardController(1)) - { - Location = new Point(15, 15) - }); + ControllerBox.Controls.AddRange(new PceSchema().GetPads().ToArray()); break; case "SNES": ControllerBox.Controls.Add(new VirtualPad( diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PceSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PceSchema.cs index 4a19c2eed2..3a77ec36c4 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PceSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PceSchema.cs @@ -1,9 +1,27 @@ -using System.Drawing; +using System.Collections.Generic; +using System.ComponentModel; +using System.Drawing; + +using BizHawk.Client.Common; namespace BizHawk.Client.EmuHawk { - public static class PceSchema + [Description("PCE")] + public class PceSchema : IVirtualPadSchema { + public IEnumerable GetPads() + { + yield return new VirtualPad(StandardController(1)) + { + Location = new Point(15, 15) + }; + + yield return new VirtualPad(StandardController(1)) + { + Location = new Point(200, 15) + }; + } + public static PadSchema StandardController(int controller) { return new PadSchema