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

Restored Default keys, also, InputWidget no longer accepts tab, but accepts everything else. Tab code was commented out.

This commit is contained in:
kylethomson 2011-02-20 03:51:18 +00:00
parent a17c0270c2
commit 36a81e6ac4
2 changed files with 51 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
BizHawk.MultiClient/Config.cs
View File

@ -4,13 +4,13 @@
{ {
public Config() public Config()
{ {
SMSController[0] = new SMSControllerTemplate(1); SMSController[0] = new SMSControllerTemplate(1, true);
SMSController[1] = new SMSControllerTemplate(2); SMSController[1] = new SMSControllerTemplate(2, false);
PCEController[0] = new PCEControllerTemplate(1); PCEController[0] = new PCEControllerTemplate(1,true);
PCEController[1] = new PCEControllerTemplate(2); PCEController[1] = new PCEControllerTemplate(2,false);
PCEController[2] = new PCEControllerTemplate(3); PCEController[2] = new PCEControllerTemplate(3,false);
PCEController[3] = new PCEControllerTemplate(4); PCEController[3] = new PCEControllerTemplate(4,false);
PCEController[4] = new PCEControllerTemplate(5); PCEController[4] = new PCEControllerTemplate(5,false);
} }
// General Client Settings // General Client Settings
@ -133,7 +133,9 @@
public string Right; public string Right;
public string B1; public string B1;
public string B2; public string B2;
public SMSControllerTemplate(int i) public SMSControllerTemplate(int i, bool defaults)
{
if (!defaults)
{ {
Up = string.Format("J{0} Up", i); Up = string.Format("J{0} Up", i);
Down = string.Format("J{0} Down", i); Down = string.Format("J{0} Down", i);
@ -142,6 +144,16 @@
B1 = string.Format("J{0} B1", i); B1 = string.Format("J{0} B1", i);
B2 = string.Format("J{0} B2", i); B2 = string.Format("J{0} B2", i);
} }
else
{
Up = string.Format("J{0} Up, UpArrow", i);
Down = string.Format("J{0} Down, DownArrow", i);
Left = string.Format("J{0} Left, LeftArrow", i);
Right = string.Format("J{0} Right, RightArrow", i);
B1 = string.Format("J{0} B1, Z", i);
B2 = string.Format("J{0} B2, X", i);
}
}
} }
public class PCEControllerTemplate public class PCEControllerTemplate
{ {
@ -153,7 +165,9 @@
public string II; public string II;
public string Run; public string Run;
public string Select; public string Select;
public PCEControllerTemplate(int i) public PCEControllerTemplate(int i, bool defaults)
{
if (!defaults)
{ {
Up = string.Format("J{0} Up", i); Up = string.Format("J{0} Up", i);
Down = string.Format("J{0} Down", i); Down = string.Format("J{0} Down", i);
@ -164,6 +178,18 @@
Run = string.Format("J{0} Run", i); Run = string.Format("J{0} Run", i);
Select = string.Format("J{0} Select", i); Select = string.Format("J{0} Select", i);
} }
else
{
Up = string.Format("J{0} Up, UpArrow", i);
Down = string.Format("J{0} Down, DownArrow", i);
Left = string.Format("J{0} Left, LeftArrow", i);
Right = string.Format("J{0} Right, RightArrow", i);
I = string.Format("J{0} I, Z", i);
II = string.Format("J{0} II, X", i);
Run = string.Format("J{0} Run, C", i);
Select = string.Format("J{0} Select, V", i);
}
}
} }
public class NESControllerTemplate public class NESControllerTemplate
{ {

4
BizHawk.MultiClient/config/InputWidget.cs
View File

@ -64,7 +64,7 @@ namespace BizHawk.MultiClient
base.OnLostFocus(e); base.OnLostFocus(e);
BackColor = SystemColors.Window; BackColor = SystemColors.Window;
} }
protected override bool ProcessCmdKey(ref Message msg, Keys keyData) /* protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
{ {
if (keyData == Keys.Tab) if (keyData == Keys.Tab)
{ {
@ -77,7 +77,7 @@ namespace BizHawk.MultiClient
else else
base.ProcessCmdKey(ref msg, keyData); base.ProcessCmdKey(ref msg, keyData);
return true; return true;
} }*/
} }
public class KeyboardBinding : IBinding public class KeyboardBinding : IBinding
{ {