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

-Made the last two TI-83 buttons visible in the Config by increasing the height from 556 to 580. 

-Started merging TI-83 to Do:
--This is going to be difficult because the field names are not the same as the label names, meaning that I'm going to have to use a dictionary for TI-83, if not for all of the controls.
--I have to create a formula that calculates the proper row / column for a given field to be placed. Sounds like fun.
This commit is contained in:
brandman211 2012-03-25 02:36:20 +00:00
parent a07165cffd
commit 5e126bf04f
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,7 @@ namespace BizHawk.MultiClient
{"SMS / GG / SG-1000", new string[8] { "Up", "Down", "Left", "Right", "B1", "B2", "Pause", "Reset" } }, {"SMS / GG / SG-1000", new string[8] { "Up", "Down", "Left", "Right", "B1", "B2", "Pause", "Reset" } },
{ {
// TODO: display shift / alpha names too, Also order these like on the calculator // TODO: display shift / alpha names too, Also order these like on the calculator
"TI83", new string[50] { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", ".", "ON", "TI-83", new string[50] { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", ".", "ON",
"ENTER", "Up", "Down", "Left", "Right", "+", "-", "Multiply", "Divide", "CLEAR", "^", "-", "(", ")", "TAN", "ENTER", "Up", "Down", "Left", "Right", "+", "-", "Multiply", "Divide", "CLEAR", "^", "-", "(", ")", "TAN",
"VARS", "COS", "PRGM", "STAT", "Matrix", "X", "STO->", "LN", "LOG", "^2", "^-1", "MATH", "ALPHA", "GRAPH", "VARS", "COS", "PRGM", "STAT", "Matrix", "X", "STO->", "LN", "LOG", "^2", "^-1", "MATH", "ALPHA", "GRAPH",
"TRACE", "ZOOM", "WINDOW", "Y", "2nd", "MODE", "Del", ",", "SIN" } "TRACE", "ZOOM", "WINDOW", "Y", "2nd", "MODE", "Del", ",", "SIN" }
@ -41,7 +41,7 @@ namespace BizHawk.MultiClient
}; };
public static readonly Dictionary<string, int> PADS = new Dictionary<string, int>() public static readonly Dictionary<string, int> PADS = new Dictionary<string, int>()
{ {
{"NES", 4}, {"PC Engine / SuperGrafx", 5}, {"SMS / GG / SG-1000", 2} {"NES", 4}, {"PC Engine / SuperGrafx", 5}, {"SMS / GG / SG-1000", 2}, {"TI-83", 1}
}; };
public static string[] AtariControlList = new string[] { "Up", "Down", "Left", "Right", "Button" }; public static string[] AtariControlList = new string[] { "Up", "Down", "Left", "Right", "Button" };
private ArrayList Labels; private ArrayList Labels;
@ -631,6 +631,10 @@ namespace BizHawk.MultiClient
controller = Global.Config.SMSController; controller = Global.Config.SMSController;
autoController = Global.Config.SMSAutoController; autoController = Global.Config.SMSAutoController;
break; break;
case "TI-83":
ControllerImage.Image = BizHawk.MultiClient.Properties.Resources.TI83CalculatorCrop;
controller = Global.Config.TI83Controller;
break;
default: default:
return; return;
} }
@ -652,6 +656,9 @@ namespace BizHawk.MultiClient
case "SMS / GG / SG-1000": case "SMS / GG / SG-1000":
IDX_CONTROLLERENABLED.Checked = ((SMSControllerTemplate)mainController[jpad]).Enabled; IDX_CONTROLLERENABLED.Checked = ((SMSControllerTemplate)mainController[jpad]).Enabled;
break; break;
case "TI-83":
IDX_CONTROLLERENABLED.Checked = ((TI83ControllerTemplate)mainController[jpad]).Enabled;
break;
} }
Labels.Clear(); Labels.Clear();
TextBoxes.Clear(); TextBoxes.Clear();
@ -693,6 +700,12 @@ namespace BizHawk.MultiClient
field = Global.Config.SmsReset; field = Global.Config.SmsReset;
break; break;
} }
case "TI-83":
{
TI83ControllerTemplate obj = (TI83ControllerTemplate)controller[jpad];
field = obj.GetType().GetField(fieldName).GetValue(obj);
break;
}
} }
TempTextBox.SetBindings((string)field); TempTextBox.SetBindings((string)field);
ButtonsGroupBox.Controls.Add(TempTextBox); ButtonsGroupBox.Controls.Add(TempTextBox);
@ -862,8 +875,8 @@ namespace BizHawk.MultiClient
joypads = 1; joypads = 1;
if (this.Width < 690) if (this.Width < 690)
this.Width = 690; this.Width = 690;
if (this.Height < 556) if (this.Height < 580)
this.Height = 556; this.Height = 580;
break; break;
case "NES": case "NES":
joypads = 4; joypads = 4;