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

Fix up more TI83 buttons stuff, input display no longer crashes when navigating away from the TI83 section.

This commit is contained in:
andres.delikat 2011-04-25 00:45:22 +00:00
parent c9067cc2ee
commit c9bca52ccb
4 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BizHawk.Emulation/Consoles/Calculator/TI83.cs
View File

@ -131,8 +131,6 @@ namespace BizHawk.Emulation.Consoles.Calculator
else input += "."; else input += ".";
if (Controller.IsPressed("SIN")) input += "S"; if (Controller.IsPressed("SIN")) input += "S";
else input += "."; else input += ".";
if (Controller.IsPressed("APPS")) input += "@";
else input += ".";
input += "|.|"; //TODO: perhaps ON should go here? input += "|.|"; //TODO: perhaps ON should go here?
@ -242,8 +240,6 @@ namespace BizHawk.Emulation.Consoles.Calculator
Controller.ForceButton("COMMA"); Controller.ForceButton("COMMA");
if (mnemonic[50] != '.') if (mnemonic[50] != '.')
Controller.ForceButton("SIN"); Controller.ForceButton("SIN");
if (mnemonic[51] != '.')
Controller.ForceButton("APPS");
} }
public byte ReadMemory(ushort addr) public byte ReadMemory(ushort addr)
@ -598,7 +594,7 @@ namespace BizHawk.Emulation.Consoles.Calculator
"CLEAR", "EXP", "DASH", "PARACLOSE", "TAN", "VARS", "PARAOPEN", "CLEAR", "EXP", "DASH", "PARACLOSE", "TAN", "VARS", "PARAOPEN",
"COS", "PRGM", "STAT", "COMMA", "SIN", "MATRIX", "X", "COS", "PRGM", "STAT", "COMMA", "SIN", "MATRIX", "X",
"STO", "LN", "LOG", "SQUARED", "NEG1", "MATH", "ALPHA", "STO", "LN", "LOG", "SQUARED", "NEG1", "MATH", "ALPHA",
"GRAPH", "TRACE", "ZOOM", "WINDOW", "Y", "2ND", "MODE", "DEL", "APPS" "GRAPH", "TRACE", "ZOOM", "WINDOW", "Y", "2ND", "MODE", "DEL"
} }
}; };

3
BizHawk.MultiClient/Config.cs
View File

@ -412,7 +412,6 @@
public TI83ControllerTemplate() { } public TI83ControllerTemplate() { }
public bool Enabled; public bool Enabled;
public string COMMA; public string COMMA;
public string APPS;
public TI83ControllerTemplate(bool defaults) public TI83ControllerTemplate(bool defaults)
{ {
if (defaults) if (defaults)
@ -468,7 +467,6 @@
DEL = "Delete"; //47 DEL = "Delete"; //47
COMMA = "Comma"; //48 COMMA = "Comma"; //48
SIN = "Period"; //49 SIN = "Period"; //49
APPS = "Home"; //50
} }
else else
{ {
@ -523,7 +521,6 @@
MODE = ""; MODE = "";
DEL = ""; DEL = "";
COMMA = ""; COMMA = "";
APPS = "";
} }
} }
} }

1
BizHawk.MultiClient/MainForm.cs
View File

@ -435,7 +435,6 @@ namespace BizHawk.MultiClient
TI83Controls.BindMulti("DEL", Global.Config.TI83Controller[0].DEL); TI83Controls.BindMulti("DEL", Global.Config.TI83Controller[0].DEL);
TI83Controls.BindMulti("DEL", Global.Config.TI83Controller[0].COMMA); TI83Controls.BindMulti("DEL", Global.Config.TI83Controller[0].COMMA);
TI83Controls.BindMulti("DEL", Global.Config.TI83Controller[0].SIN); TI83Controls.BindMulti("DEL", Global.Config.TI83Controller[0].SIN);
TI83Controls.BindMulti("DEL", Global.Config.TI83Controller[0].APPS);
Global.TI83Controls = TI83Controls; Global.TI83Controls = TI83Controls;
} }

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

@ -10,9 +10,9 @@ using System.Windows.Forms;
namespace BizHawk.MultiClient namespace BizHawk.MultiClient
{ {
//TODO: Multi column for TI83 //TODO:
//TODO: keep track of size of dynamic inputwidget creation and resize the dialog + groupbox accordingly //Sizing event should change prevWidth & prevHeight
//Navigate away from TI83 = crash
public partial class InputConfig : Form public partial class InputConfig : Form
{ {
@ -26,7 +26,7 @@ namespace BizHawk.MultiClient
public static string[] TI83ControlList = new string[] { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", ".", "ON", public static string[] TI83ControlList = new string[] { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", ".", "ON",
"ENTER", "Up", "Down", "Left", "Right", "+", "-", "Multiply", "Divide", "CLEAR", "^", "-", "(", ")", "TAN", "VARS", "ENTER", "Up", "Down", "Left", "Right", "+", "-", "Multiply", "Divide", "CLEAR", "^", "-", "(", ")", "TAN", "VARS",
"COS", "PRGM", "STAT", "Matrix", "X", "STO->", "LN", "LOG", "^2", "^-1", "MATH", "ALPHA", "GRAPH", "TRACE", "ZOOM", "WINDOW", "COS", "PRGM", "STAT", "Matrix", "X", "STO->", "LN", "LOG", "^2", "^-1", "MATH", "ALPHA", "GRAPH", "TRACE", "ZOOM", "WINDOW",
"Y", "2nd", "MODE", "Del", ",", "SIN", "APPS"}; //TODO: display shift / alpha names too, Also order these in the order "Y", "2nd", "MODE", "Del", ",", "SIN"}; //TODO: display shift / alpha names too, Also order these like on the calculator
private ArrayList Labels; private ArrayList Labels;
private ArrayList TextBoxes; private ArrayList TextBoxes;
private string CurSelectConsole; private string CurSelectConsole;
@ -264,7 +264,6 @@ namespace BizHawk.MultiClient
ButtonMappings[47] = Global.Config.TI83Controller[jpad].DEL; ButtonMappings[47] = Global.Config.TI83Controller[jpad].DEL;
ButtonMappings[48] = Global.Config.TI83Controller[jpad].COMMA; ButtonMappings[48] = Global.Config.TI83Controller[jpad].COMMA;
ButtonMappings[49] = Global.Config.TI83Controller[jpad].SIN; ButtonMappings[49] = Global.Config.TI83Controller[jpad].SIN;
ButtonMappings[50] = Global.Config.TI83Controller[jpad].APPS;
IDX_CONTROLLERENABLED.Checked = Global.Config.TI83Controller[jpad].Enabled; IDX_CONTROLLERENABLED.Checked = Global.Config.TI83Controller[jpad].Enabled;
Changed = true; Changed = true;
Labels.Clear(); Labels.Clear();
@ -472,9 +471,6 @@ namespace BizHawk.MultiClient
TempBox = TextBoxes[49] as InputWidget; TempBox = TextBoxes[49] as InputWidget;
Global.Config.TI83Controller[0].SIN = AppendButtonMapping(TempBox.Text, Global.Config.TI83Controller[0].SIN); Global.Config.TI83Controller[0].SIN = AppendButtonMapping(TempBox.Text, Global.Config.TI83Controller[0].SIN);
TempBox.Dispose(); TempBox.Dispose();
TempBox = TextBoxes[50] as InputWidget;
Global.Config.TI83Controller[0].APPS = AppendButtonMapping(TempBox.Text, Global.Config.TI83Controller[0].APPS);
TempBox.Dispose();
for (int i = 0; i < TI83ControlList.Length; i++) for (int i = 0; i < TI83ControlList.Length; i++)
{ {
@ -482,7 +478,7 @@ namespace BizHawk.MultiClient
TempLabel.Dispose(); TempLabel.Dispose();
} }
IDX_CONTROLLERENABLED.Enabled = true; IDX_CONTROLLERENABLED.Enabled = true;
} }
private void DoGameBoy() private void DoGameBoy()