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

Coleco - hook up controller 2

This commit is contained in:
adelikat 2012-11-17 22:38:32 +00:00
parent 076cbe38e6
commit 823e84592a
7 changed files with 183 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
BizHawk.MultiClient/Config.cs
View File

@ -54,8 +54,10 @@ namespace BizHawk.MultiClient
SNESAutoController[2] = new SNESControllerTemplate(false); SNESAutoController[2] = new SNESControllerTemplate(false);
SNESAutoController[3] = new SNESControllerTemplate(false); SNESAutoController[3] = new SNESControllerTemplate(false);
ColecoController = new ColecoVisionControllerTemplate(true); ColecoController[0] = new ColecoVisionControllerTemplate(true);
ColecoAutoController = new ColecoVisionControllerTemplate(false); ColecoController[1] = new ColecoVisionControllerTemplate(false);
ColecoAutoController[0] = new ColecoVisionControllerTemplate(false);
ColecoAutoController[1] = new ColecoVisionControllerTemplate(false);
C64Joysticks[0] = new SingleButtonJoyStickTemplate(true, true); C64Joysticks[0] = new SingleButtonJoyStickTemplate(true, true);
C64Joysticks[1] = new SingleButtonJoyStickTemplate(false); C64Joysticks[1] = new SingleButtonJoyStickTemplate(false);
@ -684,8 +686,8 @@ namespace BizHawk.MultiClient
public bool Atari2600_RightDifficulty = true; public bool Atari2600_RightDifficulty = true;
//ColecoVision //ColecoVision
public ColecoVisionControllerTemplate ColecoController = new ColecoVisionControllerTemplate(true); public ColecoVisionControllerTemplate[] ColecoController = new ColecoVisionControllerTemplate[2];
public ColecoVisionControllerTemplate ColecoAutoController = new ColecoVisionControllerTemplate(false); public ColecoVisionControllerTemplate[] ColecoAutoController = new ColecoVisionControllerTemplate[2];
//NES settings //NES settings
public NESControllerTemplate[] NESController = new NESControllerTemplate[4]; public NESControllerTemplate[] NESController = new NESControllerTemplate[4];

2
BizHawk.MultiClient/Global.cs
View File

@ -136,7 +136,7 @@ namespace BizHawk.MultiClient
{"Gameboy Controller", 1}, {"Genesis 3-Button Controller", 2}, {"NES Controller", 4}, {"Gameboy Controller", 1}, {"Genesis 3-Button Controller", 2}, {"NES Controller", 4},
{"SNES Controller", 4}, {"SNES Controller", 4},
{"PC Engine Controller", 5}, {"SMS Controller", 2}, {"TI83 Controller", 1}, {"Atari 2600 Basic Controller", 2}, {"PC Engine Controller", 5}, {"SMS Controller", 2}, {"TI83 Controller", 1}, {"Atari 2600 Basic Controller", 2},
{"ColecoVision Basic Controller", 1} {"ColecoVision Basic Controller", 2}
}; };
/// <summary> /// <summary>

122
BizHawk.MultiClient/MainForm.cs
View File

@ -954,49 +954,91 @@ namespace BizHawk.MultiClient
Global.AutofireAtari2600Controls = autofireA2600Controls; Global.AutofireAtari2600Controls = autofireA2600Controls;
var colecoControls = new Controller(ColecoVision.ColecoVisionControllerDefinition); var colecoControls = new Controller(ColecoVision.ColecoVisionControllerDefinition);
colecoControls.BindMulti("P1 Up", Global.Config.ColecoController.Up); colecoControls.BindMulti("P1 Up", Global.Config.ColecoController[0].Up);
colecoControls.BindMulti("P1 Left", Global.Config.ColecoController.Left); colecoControls.BindMulti("P1 Left", Global.Config.ColecoController[0].Left);
colecoControls.BindMulti("P1 Right", Global.Config.ColecoController.Right); colecoControls.BindMulti("P1 Right", Global.Config.ColecoController[0].Right);
colecoControls.BindMulti("P1 Down", Global.Config.ColecoController.Down); colecoControls.BindMulti("P1 Down", Global.Config.ColecoController[0].Down);
colecoControls.BindMulti("P1 L1", Global.Config.ColecoController.L1); colecoControls.BindMulti("P1 L1", Global.Config.ColecoController[0].L1);
colecoControls.BindMulti("P1 L2", Global.Config.ColecoController.L2); colecoControls.BindMulti("P1 L2", Global.Config.ColecoController[0].L2);
colecoControls.BindMulti("P1 R1", Global.Config.ColecoController.R1); colecoControls.BindMulti("P1 R1", Global.Config.ColecoController[0].R1);
colecoControls.BindMulti("P1 R2", Global.Config.ColecoController.R2); colecoControls.BindMulti("P1 R2", Global.Config.ColecoController[0].R2);
colecoControls.BindMulti("P1 Key0", Global.Config.ColecoController._0); colecoControls.BindMulti("P1 Key0", Global.Config.ColecoController[0]._0);
colecoControls.BindMulti("P1 Key1", Global.Config.ColecoController._1); colecoControls.BindMulti("P1 Key1", Global.Config.ColecoController[0]._1);
colecoControls.BindMulti("P1 Key2", Global.Config.ColecoController._2); colecoControls.BindMulti("P1 Key2", Global.Config.ColecoController[0]._2);
colecoControls.BindMulti("P1 Key3", Global.Config.ColecoController._3); colecoControls.BindMulti("P1 Key3", Global.Config.ColecoController[0]._3);
colecoControls.BindMulti("P1 Key4", Global.Config.ColecoController._4); colecoControls.BindMulti("P1 Key4", Global.Config.ColecoController[0]._4);
colecoControls.BindMulti("P1 Key5", Global.Config.ColecoController._5); colecoControls.BindMulti("P1 Key5", Global.Config.ColecoController[0]._5);
colecoControls.BindMulti("P1 Key6", Global.Config.ColecoController._6); colecoControls.BindMulti("P1 Key6", Global.Config.ColecoController[0]._6);
colecoControls.BindMulti("P1 Key7", Global.Config.ColecoController._7); colecoControls.BindMulti("P1 Key7", Global.Config.ColecoController[0]._7);
colecoControls.BindMulti("P1 Key8", Global.Config.ColecoController._8); colecoControls.BindMulti("P1 Key8", Global.Config.ColecoController[0]._8);
colecoControls.BindMulti("P1 Key9", Global.Config.ColecoController._9); colecoControls.BindMulti("P1 Key9", Global.Config.ColecoController[0]._9);
colecoControls.BindMulti("P1 Star", Global.Config.ColecoController.Star); colecoControls.BindMulti("P1 Star", Global.Config.ColecoController[0].Star);
colecoControls.BindMulti("P1 Pound", Global.Config.ColecoController.Pound); colecoControls.BindMulti("P1 Pound", Global.Config.ColecoController[0].Pound);
colecoControls.BindMulti("P2 Up", Global.Config.ColecoController[1].Up);
colecoControls.BindMulti("P2 Left", Global.Config.ColecoController[1].Left);
colecoControls.BindMulti("P2 Right", Global.Config.ColecoController[1].Right);
colecoControls.BindMulti("P2 Down", Global.Config.ColecoController[1].Down);
colecoControls.BindMulti("P2 L1", Global.Config.ColecoController[1].L1);
colecoControls.BindMulti("P2 L2", Global.Config.ColecoController[1].L2);
colecoControls.BindMulti("P2 R1", Global.Config.ColecoController[1].R1);
colecoControls.BindMulti("P2 R2", Global.Config.ColecoController[1].R2);
colecoControls.BindMulti("P2 Key0", Global.Config.ColecoController[1]._0);
colecoControls.BindMulti("P2 Key1", Global.Config.ColecoController[1]._1);
colecoControls.BindMulti("P2 Key2", Global.Config.ColecoController[1]._2);
colecoControls.BindMulti("P2 Key3", Global.Config.ColecoController[1]._3);
colecoControls.BindMulti("P2 Key4", Global.Config.ColecoController[1]._4);
colecoControls.BindMulti("P2 Key5", Global.Config.ColecoController[1]._5);
colecoControls.BindMulti("P2 Key6", Global.Config.ColecoController[1]._6);
colecoControls.BindMulti("P2 Key7", Global.Config.ColecoController[1]._7);
colecoControls.BindMulti("P2 Key8", Global.Config.ColecoController[1]._8);
colecoControls.BindMulti("P2 Key9", Global.Config.ColecoController[1]._9);
colecoControls.BindMulti("P2 Star", Global.Config.ColecoController[1].Star);
colecoControls.BindMulti("P2 Pound", Global.Config.ColecoController[1].Pound);
Global.ColecoControls = colecoControls; Global.ColecoControls = colecoControls;
var acolecoControls = new AutofireController(ColecoVision.ColecoVisionControllerDefinition); var acolecoControls = new AutofireController(ColecoVision.ColecoVisionControllerDefinition);
acolecoControls.BindMulti("P1 Up", Global.Config.ColecoAutoController.Up); acolecoControls.BindMulti("P1 Up", Global.Config.ColecoAutoController[0].Up);
acolecoControls.BindMulti("P1 Left", Global.Config.ColecoAutoController.Left); acolecoControls.BindMulti("P1 Left", Global.Config.ColecoAutoController[0].Left);
acolecoControls.BindMulti("P1 Right", Global.Config.ColecoAutoController.Right); acolecoControls.BindMulti("P1 Right", Global.Config.ColecoAutoController[0].Right);
acolecoControls.BindMulti("P1 Down", Global.Config.ColecoAutoController.Down); acolecoControls.BindMulti("P1 Down", Global.Config.ColecoAutoController[0].Down);
acolecoControls.BindMulti("P1 L1", Global.Config.ColecoAutoController.L1); acolecoControls.BindMulti("P1 L1", Global.Config.ColecoAutoController[0].L1);
acolecoControls.BindMulti("P1 L2", Global.Config.ColecoAutoController.L2); acolecoControls.BindMulti("P1 L2", Global.Config.ColecoAutoController[0].L2);
acolecoControls.BindMulti("P1 R1", Global.Config.ColecoAutoController.R1); acolecoControls.BindMulti("P1 R1", Global.Config.ColecoAutoController[0].R1);
acolecoControls.BindMulti("P1 R2", Global.Config.ColecoAutoController.R2); acolecoControls.BindMulti("P1 R2", Global.Config.ColecoAutoController[0].R2);
acolecoControls.BindMulti("P1 Key0", Global.Config.ColecoAutoController._0); acolecoControls.BindMulti("P1 Key0", Global.Config.ColecoAutoController[0]._0);
acolecoControls.BindMulti("P1 Key1", Global.Config.ColecoAutoController._1); acolecoControls.BindMulti("P1 Key1", Global.Config.ColecoAutoController[0]._1);
acolecoControls.BindMulti("P1 Key2", Global.Config.ColecoAutoController._2); acolecoControls.BindMulti("P1 Key2", Global.Config.ColecoAutoController[0]._2);
acolecoControls.BindMulti("P1 Key3", Global.Config.ColecoAutoController._3); acolecoControls.BindMulti("P1 Key3", Global.Config.ColecoAutoController[0]._3);
acolecoControls.BindMulti("P1 Key4", Global.Config.ColecoAutoController._4); acolecoControls.BindMulti("P1 Key4", Global.Config.ColecoAutoController[0]._4);
acolecoControls.BindMulti("P1 Key5", Global.Config.ColecoAutoController._5); acolecoControls.BindMulti("P1 Key5", Global.Config.ColecoAutoController[0]._5);
acolecoControls.BindMulti("P1 Key6", Global.Config.ColecoAutoController._6); acolecoControls.BindMulti("P1 Key6", Global.Config.ColecoAutoController[0]._6);
acolecoControls.BindMulti("P1 Key7", Global.Config.ColecoAutoController._7); acolecoControls.BindMulti("P1 Key7", Global.Config.ColecoAutoController[0]._7);
acolecoControls.BindMulti("P1 Key8", Global.Config.ColecoAutoController._8); acolecoControls.BindMulti("P1 Key8", Global.Config.ColecoAutoController[0]._8);
acolecoControls.BindMulti("P1 Key9", Global.Config.ColecoAutoController._9); acolecoControls.BindMulti("P1 Key9", Global.Config.ColecoAutoController[0]._9);
acolecoControls.BindMulti("P1 Star", Global.Config.ColecoAutoController.Star); acolecoControls.BindMulti("P1 Star", Global.Config.ColecoAutoController[0].Star);
acolecoControls.BindMulti("P1 Pound", Global.Config.ColecoController.Pound); acolecoControls.BindMulti("P1 Pound", Global.Config.ColecoController[0].Pound);
acolecoControls.BindMulti("P2 Up", Global.Config.ColecoAutoController[1].Up);
acolecoControls.BindMulti("P2 Left", Global.Config.ColecoAutoController[1].Left);
acolecoControls.BindMulti("P2 Right", Global.Config.ColecoAutoController[1].Right);
acolecoControls.BindMulti("P2 Down", Global.Config.ColecoAutoController[1].Down);
acolecoControls.BindMulti("P2 L1", Global.Config.ColecoAutoController[1].L1);
acolecoControls.BindMulti("P2 L2", Global.Config.ColecoAutoController[1].L2);
acolecoControls.BindMulti("P2 R1", Global.Config.ColecoAutoController[1].R1);
acolecoControls.BindMulti("P2 R2", Global.Config.ColecoAutoController[1].R2);
acolecoControls.BindMulti("P2 Key0", Global.Config.ColecoAutoController[1]._0);
acolecoControls.BindMulti("P2 Key1", Global.Config.ColecoAutoController[1]._1);
acolecoControls.BindMulti("P2 Key2", Global.Config.ColecoAutoController[1]._2);
acolecoControls.BindMulti("P2 Key3", Global.Config.ColecoAutoController[1]._3);
acolecoControls.BindMulti("P2 Key4", Global.Config.ColecoAutoController[1]._4);
acolecoControls.BindMulti("P2 Key5", Global.Config.ColecoAutoController[1]._5);
acolecoControls.BindMulti("P2 Key6", Global.Config.ColecoAutoController[1]._6);
acolecoControls.BindMulti("P2 Key7", Global.Config.ColecoAutoController[1]._7);
acolecoControls.BindMulti("P2 Key8", Global.Config.ColecoAutoController[1]._8);
acolecoControls.BindMulti("P2 Key9", Global.Config.ColecoAutoController[1]._9);
acolecoControls.BindMulti("P2 Star", Global.Config.ColecoAutoController[1].Star);
acolecoControls.BindMulti("P2 Pound", Global.Config.ColecoController[1].Pound);
Global.AutofireColecoControls = acolecoControls; Global.AutofireColecoControls = acolecoControls;
var TI83Controls = new Controller(TI83.TI83Controller); var TI83Controls = new Controller(TI83.TI83Controller);

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

@ -30,6 +30,7 @@
{ {
this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage(); this.tabPage1 = new System.Windows.Forms.TabPage();
this.pictureBox14 = new System.Windows.Forms.PictureBox();
this.tabControl2 = new System.Windows.Forms.TabControl(); this.tabControl2 = new System.Windows.Forms.TabControl();
this.tabPage13 = new System.Windows.Forms.TabPage(); this.tabPage13 = new System.Windows.Forms.TabPage();
this.tabPage14 = new System.Windows.Forms.TabPage(); this.tabPage14 = new System.Windows.Forms.TabPage();
@ -109,6 +110,7 @@
this.tabPage8 = new System.Windows.Forms.TabPage(); this.tabPage8 = new System.Windows.Forms.TabPage();
this.pictureBox7 = new System.Windows.Forms.PictureBox(); this.pictureBox7 = new System.Windows.Forms.PictureBox();
this.tabPage59 = new System.Windows.Forms.TabPage(); this.tabPage59 = new System.Windows.Forms.TabPage();
this.pictureBox15 = new System.Windows.Forms.PictureBox();
this.tabControl10 = new System.Windows.Forms.TabControl(); this.tabControl10 = new System.Windows.Forms.TabControl();
this.tabPage60 = new System.Windows.Forms.TabPage(); this.tabPage60 = new System.Windows.Forms.TabPage();
this.tabPage61 = new System.Windows.Forms.TabPage(); this.tabPage61 = new System.Windows.Forms.TabPage();
@ -116,6 +118,8 @@
this.OK = new System.Windows.Forms.Button(); this.OK = new System.Windows.Forms.Button();
this.label38 = new System.Windows.Forms.Label(); this.label38 = new System.Windows.Forms.Label();
this.AllowLR = new System.Windows.Forms.CheckBox(); this.AllowLR = new System.Windows.Forms.CheckBox();
this.tabPage62 = new System.Windows.Forms.TabPage();
this.tabPage63 = new System.Windows.Forms.TabPage();
this.NESController1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.NESController1Panel = new BizHawk.MultiClient.ControllerConfigPanel();
this.NESController2Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.NESController2Panel = new BizHawk.MultiClient.ControllerConfigPanel();
this.NESController3Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.NESController3Panel = new BizHawk.MultiClient.ControllerConfigPanel();
@ -167,10 +171,11 @@
this.TI83ControllerPanel = new BizHawk.MultiClient.ControllerConfigPanel(); this.TI83ControllerPanel = new BizHawk.MultiClient.ControllerConfigPanel();
this.COLController1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.COLController1Panel = new BizHawk.MultiClient.ControllerConfigPanel();
this.COLAutofire1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.COLAutofire1Panel = new BizHawk.MultiClient.ControllerConfigPanel();
this.pictureBox14 = new System.Windows.Forms.PictureBox(); this.COLController2Panel = new BizHawk.MultiClient.ControllerConfigPanel();
this.pictureBox15 = new System.Windows.Forms.PictureBox(); this.COLAutofire2Panel = new BizHawk.MultiClient.ControllerConfigPanel();
this.tabControl1.SuspendLayout(); this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout(); this.tabPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox14)).BeginInit();
this.tabControl2.SuspendLayout(); this.tabControl2.SuspendLayout();
this.tabPage13.SuspendLayout(); this.tabPage13.SuspendLayout();
this.tabPage14.SuspendLayout(); this.tabPage14.SuspendLayout();
@ -248,11 +253,12 @@
this.tabPage8.SuspendLayout(); this.tabPage8.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).BeginInit();
this.tabPage59.SuspendLayout(); this.tabPage59.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox15)).BeginInit();
this.tabControl10.SuspendLayout(); this.tabControl10.SuspendLayout();
this.tabPage60.SuspendLayout(); this.tabPage60.SuspendLayout();
this.tabPage61.SuspendLayout(); this.tabPage61.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox14)).BeginInit(); this.tabPage62.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox15)).BeginInit(); this.tabPage63.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
// tabControl1 // tabControl1
@ -288,6 +294,18 @@
this.tabPage1.Text = "NES"; this.tabPage1.Text = "NES";
this.tabPage1.UseVisualStyleBackColor = true; this.tabPage1.UseVisualStyleBackColor = true;
// //
// pictureBox14
//
this.pictureBox14.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.pictureBox14.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.pictureBox14.Image = global::BizHawk.MultiClient.Properties.Resources.NES_Controller;
this.pictureBox14.Location = new System.Drawing.Point(497, 15);
this.pictureBox14.Name = "pictureBox14";
this.pictureBox14.Size = new System.Drawing.Size(284, 125);
this.pictureBox14.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
this.pictureBox14.TabIndex = 6;
this.pictureBox14.TabStop = false;
//
// tabControl2 // tabControl2
// //
this.tabControl2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.tabControl2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
@ -1193,10 +1211,24 @@
this.tabPage59.Text = "Coleco V."; this.tabPage59.Text = "Coleco V.";
this.tabPage59.UseVisualStyleBackColor = true; this.tabPage59.UseVisualStyleBackColor = true;
// //
// pictureBox15
//
this.pictureBox15.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.pictureBox15.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.pictureBox15.Image = global::BizHawk.MultiClient.Properties.Resources.colecovisioncontroller;
this.pictureBox15.Location = new System.Drawing.Point(542, 15);
this.pictureBox15.Name = "pictureBox15";
this.pictureBox15.Size = new System.Drawing.Size(228, 236);
this.pictureBox15.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
this.pictureBox15.TabIndex = 6;
this.pictureBox15.TabStop = false;
//
// tabControl10 // tabControl10
// //
this.tabControl10.Controls.Add(this.tabPage60); this.tabControl10.Controls.Add(this.tabPage60);
this.tabControl10.Controls.Add(this.tabPage61); this.tabControl10.Controls.Add(this.tabPage61);
this.tabControl10.Controls.Add(this.tabPage62);
this.tabControl10.Controls.Add(this.tabPage63);
this.tabControl10.Location = new System.Drawing.Point(18, 15); this.tabControl10.Location = new System.Drawing.Point(18, 15);
this.tabControl10.Name = "tabControl10"; this.tabControl10.Name = "tabControl10";
this.tabControl10.SelectedIndex = 0; this.tabControl10.SelectedIndex = 0;
@ -1269,6 +1301,26 @@
this.AllowLR.Text = "Allow L+R / U+D"; this.AllowLR.Text = "Allow L+R / U+D";
this.AllowLR.UseVisualStyleBackColor = true; this.AllowLR.UseVisualStyleBackColor = true;
// //
// tabPage62
//
this.tabPage62.Controls.Add(this.COLController2Panel);
this.tabPage62.Location = new System.Drawing.Point(4, 22);
this.tabPage62.Name = "tabPage62";
this.tabPage62.Size = new System.Drawing.Size(371, 372);
this.tabPage62.TabIndex = 2;
this.tabPage62.Text = "Controller 2";
this.tabPage62.UseVisualStyleBackColor = true;
//
// tabPage63
//
this.tabPage63.Controls.Add(this.COLAutofire2Panel);
this.tabPage63.Location = new System.Drawing.Point(4, 22);
this.tabPage63.Name = "tabPage63";
this.tabPage63.Size = new System.Drawing.Size(371, 372);
this.tabPage63.TabIndex = 3;
this.tabPage63.Text = "Autofire 2";
this.tabPage63.UseVisualStyleBackColor = true;
//
// NESController1Panel // NESController1Panel
// //
this.NESController1Panel.Location = new System.Drawing.Point(10, 10); this.NESController1Panel.Location = new System.Drawing.Point(10, 10);
@ -1632,29 +1684,19 @@
this.COLAutofire1Panel.Size = new System.Drawing.Size(359, 332); this.COLAutofire1Panel.Size = new System.Drawing.Size(359, 332);
this.COLAutofire1Panel.TabIndex = 2; this.COLAutofire1Panel.TabIndex = 2;
// //
// pictureBox14 // COLController2Panel
// //
this.pictureBox14.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.COLController2Panel.Location = new System.Drawing.Point(3, 3);
this.pictureBox14.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; this.COLController2Panel.Name = "COLController2Panel";
this.pictureBox14.Image = global::BizHawk.MultiClient.Properties.Resources.NES_Controller; this.COLController2Panel.Size = new System.Drawing.Size(359, 332);
this.pictureBox14.Location = new System.Drawing.Point(497, 15); this.COLController2Panel.TabIndex = 2;
this.pictureBox14.Name = "pictureBox14";
this.pictureBox14.Size = new System.Drawing.Size(284, 125);
this.pictureBox14.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
this.pictureBox14.TabIndex = 6;
this.pictureBox14.TabStop = false;
// //
// pictureBox15 // COLAutofire2Panel
// //
this.pictureBox15.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.COLAutofire2Panel.Location = new System.Drawing.Point(3, 3);
this.pictureBox15.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; this.COLAutofire2Panel.Name = "COLAutofire2Panel";
this.pictureBox15.Image = global::BizHawk.MultiClient.Properties.Resources.colecovisioncontroller; this.COLAutofire2Panel.Size = new System.Drawing.Size(359, 332);
this.pictureBox15.Location = new System.Drawing.Point(542, 15); this.COLAutofire2Panel.TabIndex = 3;
this.pictureBox15.Name = "pictureBox15";
this.pictureBox15.Size = new System.Drawing.Size(228, 236);
this.pictureBox15.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
this.pictureBox15.TabIndex = 6;
this.pictureBox15.TabStop = false;
// //
// ControllerConfig // ControllerConfig
// //
@ -1673,6 +1715,7 @@
this.Load += new System.EventHandler(this.ControllerConfig_Load); this.Load += new System.EventHandler(this.ControllerConfig_Load);
this.tabControl1.ResumeLayout(false); this.tabControl1.ResumeLayout(false);
this.tabPage1.ResumeLayout(false); this.tabPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.pictureBox14)).EndInit();
this.tabControl2.ResumeLayout(false); this.tabControl2.ResumeLayout(false);
this.tabPage13.ResumeLayout(false); this.tabPage13.ResumeLayout(false);
this.tabPage14.ResumeLayout(false); this.tabPage14.ResumeLayout(false);
@ -1750,11 +1793,12 @@
this.tabPage8.ResumeLayout(false); this.tabPage8.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).EndInit();
this.tabPage59.ResumeLayout(false); this.tabPage59.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.pictureBox15)).EndInit();
this.tabControl10.ResumeLayout(false); this.tabControl10.ResumeLayout(false);
this.tabPage60.ResumeLayout(false); this.tabPage60.ResumeLayout(false);
this.tabPage61.ResumeLayout(false); this.tabPage61.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.pictureBox14)).EndInit(); this.tabPage62.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.pictureBox15)).EndInit(); this.tabPage63.ResumeLayout(false);
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout(); this.PerformLayout();
@ -1903,5 +1947,9 @@
private ControllerConfigPanel COLAutofire1Panel; private ControllerConfigPanel COLAutofire1Panel;
private System.Windows.Forms.PictureBox pictureBox14; private System.Windows.Forms.PictureBox pictureBox14;
private System.Windows.Forms.PictureBox pictureBox15; private System.Windows.Forms.PictureBox pictureBox15;
private System.Windows.Forms.TabPage tabPage62;
private System.Windows.Forms.TabPage tabPage63;
private ControllerConfigPanel COLController2Panel;
private ControllerConfigPanel COLAutofire2Panel;
} }
} }

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

@ -102,13 +102,22 @@ namespace BizHawk.MultiClient
COLController1Panel.InputSize = 110; COLController1Panel.InputSize = 110;
COLController1Panel.LabelWidth = 50; COLController1Panel.LabelWidth = 50;
COLController1Panel.ColumnWidth = 170; COLController1Panel.ColumnWidth = 170;
COLController1Panel.LoadSettings(Global.Config.ColecoController); COLController1Panel.LoadSettings(Global.Config.ColecoController[0]);
COLAutofire1Panel.InputSize = 110; COLAutofire1Panel.InputSize = 110;
COLAutofire1Panel.LabelWidth = 50; COLAutofire1Panel.LabelWidth = 50;
COLAutofire1Panel.ColumnWidth = 170; COLAutofire1Panel.ColumnWidth = 170;
COLAutofire1Panel.LoadSettings(Global.Config.ColecoAutoController); COLAutofire1Panel.LoadSettings(Global.Config.ColecoAutoController[0]);
COLController2Panel.InputSize = 110;
COLController2Panel.LabelWidth = 50;
COLController2Panel.ColumnWidth = 170;
COLController2Panel.LoadSettings(Global.Config.ColecoController[1]);
COLAutofire2Panel.InputSize = 110;
COLAutofire2Panel.LabelWidth = 50;
COLAutofire2Panel.ColumnWidth = 170;
COLAutofire2Panel.LoadSettings(Global.Config.ColecoAutoController[1]);
SetAutoTab(true); SetAutoTab(true);
} }

7
BizHawk.MultiClient/config/PathManager.cs
View File

@ -259,6 +259,9 @@ namespace BizHawk.MultiClient
case "TI83": case "TI83":
path = PathManager.MakeAbsolutePath(Global.Config.PathTI83ROMs, "TI83"); path = PathManager.MakeAbsolutePath(Global.Config.PathTI83ROMs, "TI83");
break; break;
case "Coleco":
path = PathManager.MakeAbsolutePath(Global.Config.PathCOLROMs, "Coleco");
break;
default: default:
path = PathManager.GetBasePathAbsolute(); path = PathManager.GetBasePathAbsolute();
break; break;
@ -337,6 +340,7 @@ namespace BizHawk.MultiClient
case "SNES": return MakeAbsolutePath(Global.Config.PathSNESSavestates, "SNES"); case "SNES": return MakeAbsolutePath(Global.Config.PathSNESSavestates, "SNES");
case "PSX": return MakeAbsolutePath(Global.Config.PathPSXSavestates, "PSX"); case "PSX": return MakeAbsolutePath(Global.Config.PathPSXSavestates, "PSX");
case "C64": return MakeAbsolutePath(Global.Config.PathC64Savestates, "C64"); case "C64": return MakeAbsolutePath(Global.Config.PathC64Savestates, "C64");
case "Coleco": return MakeAbsolutePath(Global.Config.PathCOLSavestates, "Coleco");
} }
} }
@ -366,6 +370,7 @@ namespace BizHawk.MultiClient
case "SNES": return Path.Combine(MakeAbsolutePath(Global.Config.PathSNESSavestates, "SNES"), name); case "SNES": return Path.Combine(MakeAbsolutePath(Global.Config.PathSNESSavestates, "SNES"), name);
case "PSX": return Path.Combine(MakeAbsolutePath(Global.Config.PathPSXSavestates, "PSX"), name); case "PSX": return Path.Combine(MakeAbsolutePath(Global.Config.PathPSXSavestates, "PSX"), name);
case "C64": return Path.Combine(MakeAbsolutePath(Global.Config.PathC64Savestates, "C64"), name); case "C64": return Path.Combine(MakeAbsolutePath(Global.Config.PathC64Savestates, "C64"), name);
case "Coleco": return Path.Combine(MakeAbsolutePath(Global.Config.PathCOLSavestates, "Coleco"), name);
} }
return ""; return "";
} }
@ -389,7 +394,7 @@ namespace BizHawk.MultiClient
case "TI83": return Path.Combine(MakeAbsolutePath(Global.Config.PathTI83Screenshots, "TI83"), name); case "TI83": return Path.Combine(MakeAbsolutePath(Global.Config.PathTI83Screenshots, "TI83"), name);
case "SNES": return Path.Combine(MakeAbsolutePath(Global.Config.PathSNESScreenshots, "SNES"), name); case "SNES": return Path.Combine(MakeAbsolutePath(Global.Config.PathSNESScreenshots, "SNES"), name);
case "PSX": return Path.Combine(MakeAbsolutePath(Global.Config.PathPSXScreenshots, "PSX"), name); case "PSX": return Path.Combine(MakeAbsolutePath(Global.Config.PathPSXScreenshots, "PSX"), name);
case "C64": return Path.Combine(MakeAbsolutePath(Global.Config.PathC64Screenshots, "C64"), name); case "Coleco": return Path.Combine(MakeAbsolutePath(Global.Config.PathCOLScreenshots, "Coleco"), name);
} }
return ""; return "";
} }

2
BizHawk.MultiClient/movie/InputAdapters.cs
View File

@ -358,6 +358,8 @@ namespace BizHawk.MultiClient
case "PCECD": case "PCECD":
case "SGX": case "SGX":
return "|.|........|........|........|........|........|"; return "|.|........|........|........|........|........|";
case "Coleco":
return "|....................|....................|";
} }
} }