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

Fix bugs in input config regarding atari controllers, fix auto-fire controllers for atari (both controllers)

This commit is contained in:
adelikat 2012-03-23 02:15:58 +00:00
parent 715d46ed1d
commit 2e5ec4fdcb
3 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.MultiClient/LuaImplementation.cs
View File

@ -1092,8 +1092,6 @@ namespace BizHawk.MultiClient
Global.MainForm.SetReadOnly(true); Global.MainForm.SetReadOnly(true);
else else
Global.MainForm.SetReadOnly(false); Global.MainForm.SetReadOnly(false);
} }
//---------------------------------------------------- //----------------------------------------------------

18
BizHawk.MultiClient/MainForm.cs
View File

@ -691,15 +691,15 @@ namespace BizHawk.MultiClient
Global.Atari2600Controls = a2600Controls; Global.Atari2600Controls = a2600Controls;
var autofireA2600Controls = new AutofireController(Atari2600.Atari2600ControllerDefinition); var autofireA2600Controls = new AutofireController(Atari2600.Atari2600ControllerDefinition);
autofireA2600Controls.BindMulti("P1 Up", Global.Config.Atari2600Controller[0].Up); autofireA2600Controls.BindMulti("P1 Up", Global.Config.Atari2600AutoController[0].Up);
autofireA2600Controls.BindMulti("P1 Left", Global.Config.Atari2600Controller[0].Left); autofireA2600Controls.BindMulti("P1 Left", Global.Config.Atari2600AutoController[0].Left);
autofireA2600Controls.BindMulti("P1 Right", Global.Config.Atari2600Controller[0].Right); autofireA2600Controls.BindMulti("P1 Right", Global.Config.Atari2600AutoController[0].Right);
autofireA2600Controls.BindMulti("P1 Down", Global.Config.Atari2600Controller[0].Down); autofireA2600Controls.BindMulti("P1 Down", Global.Config.Atari2600AutoController[0].Down);
autofireA2600Controls.BindMulti("P1 Button", Global.Config.Atari2600Controller[0].Button); autofireA2600Controls.BindMulti("P1 Button", Global.Config.Atari2600AutoController[0].Button);
autofireA2600Controls.BindMulti("P2 Up", Global.Config.Atari2600Controller[1].Up); autofireA2600Controls.BindMulti("P2 Up", Global.Config.Atari2600AutoController[1].Up);
autofireA2600Controls.BindMulti("P2 Left", Global.Config.Atari2600Controller[1].Left); autofireA2600Controls.BindMulti("P2 Left", Global.Config.Atari2600AutoController[1].Left);
autofireA2600Controls.BindMulti("P2 Right", Global.Config.Atari2600Controller[1].Right); autofireA2600Controls.BindMulti("P2 Right", Global.Config.Atari2600AutoController[1].Right);
autofireA2600Controls.BindMulti("P2 Down", Global.Config.Atari2600Controller[1].Down); autofireA2600Controls.BindMulti("P2 Down", Global.Config.Atari2600AutoController[1].Down);
autofireA2600Controls.BindMulti("P2 Button", Global.Config.Atari2600Controller[1].Button); autofireA2600Controls.BindMulti("P2 Button", Global.Config.Atari2600Controller[1].Button);
Global.AutofireAtari2600Controls = autofireA2600Controls; Global.AutofireAtari2600Controls = autofireA2600Controls;

16
BizHawk.MultiClient/config/InputConfig.cs
View File

@ -118,8 +118,8 @@ namespace BizHawk.MultiClient
ButtonsGroupBox.Controls.Clear(); ButtonsGroupBox.Controls.Clear();
InputWidget TempBox; InputWidget TempBox;
Label TempLabel; Label TempLabel;
int controllers = 2;
if (prev < 2) if (prev < controllers)
{ {
TempBox = TextBoxes[0] as InputWidget; TempBox = TextBoxes[0] as InputWidget;
Global.Config.Atari2600Controller[prev].Up = AppendButtonMapping(TempBox.Text, Global.Config.Atari2600Controller[prev].Up); Global.Config.Atari2600Controller[prev].Up = AppendButtonMapping(TempBox.Text, Global.Config.Atari2600Controller[prev].Up);
@ -142,22 +142,22 @@ namespace BizHawk.MultiClient
else else
{ {
TempBox = TextBoxes[0] as InputWidget; TempBox = TextBoxes[0] as InputWidget;
Global.Config.Atari2600AutoController[prev - 1].Up = AppendButtonMapping(TempBox.Text, Global.Config.Atari2600AutoController[prev - 1].Up); Global.Config.Atari2600AutoController[prev - controllers].Up = AppendButtonMapping(TempBox.Text, Global.Config.Atari2600AutoController[prev - 1].Up);
TempBox.Dispose(); TempBox.Dispose();
TempBox = TextBoxes[1] as InputWidget; TempBox = TextBoxes[1] as InputWidget;
Global.Config.Atari2600AutoController[prev - 1].Down = AppendButtonMapping(TempBox.Text, Global.Config.Atari2600AutoController[prev - 1].Down); Global.Config.Atari2600AutoController[prev - controllers].Down = AppendButtonMapping(TempBox.Text, Global.Config.Atari2600AutoController[prev - 1].Down);
TempBox.Dispose(); TempBox.Dispose();
TempBox = TextBoxes[2] as InputWidget; TempBox = TextBoxes[2] as InputWidget;
Global.Config.Atari2600AutoController[prev - 1].Left = AppendButtonMapping(TempBox.Text, Global.Config.Atari2600AutoController[prev - 1].Left); Global.Config.Atari2600AutoController[prev - controllers].Left = AppendButtonMapping(TempBox.Text, Global.Config.Atari2600AutoController[prev - 1].Left);
TempBox.Dispose(); TempBox.Dispose();
TempBox = TextBoxes[3] as InputWidget; TempBox = TextBoxes[3] as InputWidget;
Global.Config.Atari2600AutoController[prev - 1].Right = AppendButtonMapping(TempBox.Text, Global.Config.Atari2600AutoController[prev - 1].Right); Global.Config.Atari2600AutoController[prev - controllers].Right = AppendButtonMapping(TempBox.Text, Global.Config.Atari2600AutoController[prev - 1].Right);
TempBox.Dispose(); TempBox.Dispose();
TempBox = TextBoxes[4] as InputWidget; TempBox = TextBoxes[4] as InputWidget;
Global.Config.Atari2600AutoController[prev - 1].Button = AppendButtonMapping(TempBox.Text, Global.Config.Atari2600AutoController[prev - 1].Button); Global.Config.Atari2600AutoController[prev - controllers].Button = AppendButtonMapping(TempBox.Text, Global.Config.Atari2600AutoController[prev - 1].Button);
TempBox.Dispose(); TempBox.Dispose();
Global.Config.Atari2600Controller[prev - 1].Enabled = IDX_CONTROLLERENABLED.Checked; Global.Config.Atari2600AutoController[prev - controllers].Enabled = IDX_CONTROLLERENABLED.Checked;
} }
TempBox.Dispose(); TempBox.Dispose();
for (int i = 0; i < AtariControlList.Length; i++) for (int i = 0; i < AtariControlList.Length; i++)