From fe6f029f398f12d61236e38efce4c8626c8f4945 Mon Sep 17 00:00:00 2001 From: goyuken Date: Sun, 16 Dec 2012 20:04:39 +0000 Subject: [PATCH] 7800: more control hookup for console buttons --- BizHawk.MultiClient/Config.cs | 1 + BizHawk.MultiClient/MainForm.cs | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/BizHawk.MultiClient/Config.cs b/BizHawk.MultiClient/Config.cs index f9e3ee6952..142ee0943d 100644 --- a/BizHawk.MultiClient/Config.cs +++ b/BizHawk.MultiClient/Config.cs @@ -1182,6 +1182,7 @@ namespace BizHawk.MultiClient public class Atari7800ConsoleButtonsTemplate : iControllerConfigObject { + public string Power = ""; public string Reset = "C"; public string Select = "V, X1 Start"; public string Pause = ""; diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index 9797de35a6..b3c4e0631a 100644 --- a/BizHawk.MultiClient/MainForm.cs +++ b/BizHawk.MultiClient/MainForm.cs @@ -996,6 +996,12 @@ namespace BizHawk.MultiClient Global.AutofireAtari2600Controls = autofireA2600Controls; var a7800Controls = new Controller(Atari7800Control.ProLineJoystick); + + a7800Controls.BindMulti("Power", Global.Config.Atari7800ConsoleButtons[0].Power); + a7800Controls.BindMulti("Reset", Global.Config.Atari7800ConsoleButtons[0].Reset); + a7800Controls.BindMulti("Select", Global.Config.Atari7800ConsoleButtons[0].Select); + a7800Controls.BindMulti("Pause", Global.Config.Atari7800ConsoleButtons[0].Pause); + a7800Controls.BindMulti("P1 Up", Global.Config.Atari7800Controller[0].Up); a7800Controls.BindMulti("P1 Left", Global.Config.Atari7800Controller[0].Left); a7800Controls.BindMulti("P1 Right", Global.Config.Atari7800Controller[0].Right); @@ -1010,10 +1016,6 @@ namespace BizHawk.MultiClient a7800Controls.BindMulti("P2 Trigger", Global.Config.Atari7800Controller[1].Button1); a7800Controls.BindMulti("P2 Trigger 2", Global.Config.Atari7800Controller[1].Button2); - //FIXME - //a7800Controls.BindMulti("Reset", Global.Config.Atari2600ConsoleButtons[0].Reset); - //a7800Controls.BindMulti("Select", Global.Config.Atari2600ConsoleButtons[0].Select); - Global.Atari7800Controls = a7800Controls; var autofireA7800Controls = new AutofireController(Atari7800Control.ProLineJoystick);