ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SNES - Implement Reset and Power as controller buttons

This commit is contained in:
adelikat 2012-11-08 04:13:55 +00:00
parent 027b56e861
commit c32cef4bc4
4 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.MultiClient/Config.cs
View File

@ -57,6 +57,7 @@ namespace BizHawk.MultiClient
ColecoController = new ColecoVisionControllerTemplate(true);
NESConsoleButtons = new NESConsoleButtonTemplate();
SNESConsoleButtons = new NESConsoleButtonTemplate();
SMSConsoleButtons = new SMSConsoleButtonTemplate();
}
@ -669,6 +670,7 @@ namespace BizHawk.MultiClient
//SNES settings
public SNESControllerTemplate[] SNESController = new SNESControllerTemplate[4];
public SNESControllerTemplate[] SNESAutoController = new SNESControllerTemplate[4];
public NESConsoleButtonTemplate SNESConsoleButtons = new NESConsoleButtonTemplate();
//TI 83 settings
public TI83ControllerTemplate[] TI83Controller = new TI83ControllerTemplate[1];

3
BizHawk.MultiClient/MainForm.cs
View File

@ -809,6 +809,9 @@ namespace BizHawk.MultiClient
snesControls.BindMulti("P" + (i + 1) + " Select", Global.Config.SNESController[i].Select);
snesControls.BindMulti("P" + (i + 1) + " Start", Global.Config.SNESController[i].Start);
}
snesControls.BindMulti("Reset", Global.Config.SNESConsoleButtons.Reset);
snesControls.BindMulti("Power", Global.Config.SNESConsoleButtons.Power);
Global.SNESControls = snesControls;

12
BizHawk.MultiClient/config/ControllerConfig.Designer.cs generated
View File

@ -147,6 +147,7 @@
this.Atari2600Autofire1Panel = new BizHawk.MultiClient.ControllerConfigPanel();
this.Atari2600Autofire2Panel = new BizHawk.MultiClient.ControllerConfigPanel();
this.TI83ControllerPanel = new BizHawk.MultiClient.ControllerConfigPanel();
this.SNESConsoleButtons = new BizHawk.MultiClient.ControllerConfigPanel();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.ControllerImage)).BeginInit();
@ -167,6 +168,7 @@
this.tabPage23.SuspendLayout();
this.tabPage24.SuspendLayout();
this.tabPage25.SuspendLayout();
this.tabPage26.SuspendLayout();
this.tabPage27.SuspendLayout();
this.tabPage28.SuspendLayout();
this.tabPage29.SuspendLayout();
@ -460,6 +462,7 @@
//
// tabPage26
//
this.tabPage26.Controls.Add(this.SNESConsoleButtons);
this.tabPage26.Location = new System.Drawing.Point(4, 22);
this.tabPage26.Name = "tabPage26";
this.tabPage26.Size = new System.Drawing.Size(445, 372);
@ -1390,6 +1393,13 @@
this.TI83ControllerPanel.Size = new System.Drawing.Size(567, 414);
this.TI83ControllerPanel.TabIndex = 1;
//
// SNESConsoleButtons
//
this.SNESConsoleButtons.Location = new System.Drawing.Point(15, 13);
this.SNESConsoleButtons.Name = "SNESConsoleButtons";
this.SNESConsoleButtons.Size = new System.Drawing.Size(368, 125);
this.SNESConsoleButtons.TabIndex = 1;
//
// ControllerConfig
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -1425,6 +1435,7 @@
this.tabPage23.ResumeLayout(false);
this.tabPage24.ResumeLayout(false);
this.tabPage25.ResumeLayout(false);
this.tabPage26.ResumeLayout(false);
this.tabPage27.ResumeLayout(false);
this.tabPage28.ResumeLayout(false);
this.tabPage29.ResumeLayout(false);
@ -1598,5 +1609,6 @@
private BizHawk.MultiClient.ControllerConfigPanel NESConsoleButtons;
private ControllerConfigPanel SMSConsoleButtons;
private ControllerConfigPanel Atari2600ConsoleButtons;
private ControllerConfigPanel SNESConsoleButtons;
}
}

1
BizHawk.MultiClient/config/ControllerConfig.cs
View File

@ -44,6 +44,7 @@ namespace BizHawk.MultiClient
SNESController2Panel.LoadSettings(Global.Config.SNESController[1]);
SNESController3Panel.LoadSettings(Global.Config.SNESController[2]);
SNESController4Panel.LoadSettings(Global.Config.SNESController[3]);
SNESConsoleButtons.LoadSettings(Global.Config.SNESConsoleButtons);
SNESAutofire1Panel.LoadSettings(Global.Config.SNESAutoController[0]);
SNESAutofire2Panel.LoadSettings(Global.Config.SNESAutoController[1]);
SNESAutofire3Panel.LoadSettings(Global.Config.SNESAutoController[2]);