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

Fixes to c64 keyboard in config.cs, start hooking up keys to the core

This commit is contained in:
adelikat 2012-11-10 03:19:42 +00:00
parent c3644d8387
commit fef2e394e3
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
BizHawk.MultiClient/Config.cs
View File

@ -700,6 +700,8 @@ namespace BizHawk.MultiClient
//Commodore 64 Settings
public SingleButtonJoyStickTemplate[] C64Joysticks = new SingleButtonJoyStickTemplate[2];
public SingleButtonJoyStickTemplate[] C64AutoJoysticks = new SingleButtonJoyStickTemplate[2];
public C64KeyboardTemplate C64Keyboard = new C64KeyboardTemplate();
public C64KeyboardTemplate C64AutofireKeyboard = new C64KeyboardTemplate();
//GIF Animator Settings
public int GifAnimatorNumFrames;
@ -1105,7 +1107,7 @@ namespace BizHawk.MultiClient
}
}
public class C64Keyboard
public class C64KeyboardTemplate
{
public string F1;
public string F3;
@ -1177,10 +1179,10 @@ namespace BizHawk.MultiClient
public string Space;
bool enabled;
public bool enabled;
public C64Keyboard() { }
public C64Keyboard(bool defaults)
public C64KeyboardTemplate() { }
public C64KeyboardTemplate(bool defaults)
{
if (defaults)
{

18
BizHawk.MultiClient/MainForm.cs
View File

@ -1040,6 +1040,24 @@ namespace BizHawk.MultiClient
CommodoreControls.BindMulti("P2 Right", Global.Config.C64Joysticks[1].Right);
CommodoreControls.BindMulti("P2 Down", Global.Config.C64Joysticks[1].Down);
CommodoreControls.BindMulti("P2 Button", Global.Config.C64Joysticks[1].Button);
CommodoreControls.BindMulti("Key F1", Global.Config.C64Keyboard.F1);
CommodoreControls.BindMulti("Key F3", Global.Config.C64Keyboard.F3);
CommodoreControls.BindMulti("Key F5", Global.Config.C64Keyboard.F5);
CommodoreControls.BindMulti("Key F7", Global.Config.C64Keyboard.F7);
CommodoreControls.BindMulti("Key Left Arrow", Global.Config.C64Keyboard.Left_Arrow);
CommodoreControls.BindMulti("Key 1", Global.Config.C64Keyboard._1);
CommodoreControls.BindMulti("Key 2", Global.Config.C64Keyboard._2);
CommodoreControls.BindMulti("Key 3", Global.Config.C64Keyboard._3);
CommodoreControls.BindMulti("Key 4", Global.Config.C64Keyboard._4);
CommodoreControls.BindMulti("Key 5", Global.Config.C64Keyboard._5);
CommodoreControls.BindMulti("Key 6", Global.Config.C64Keyboard._6);
CommodoreControls.BindMulti("Key 7", Global.Config.C64Keyboard._7);
CommodoreControls.BindMulti("Key 8", Global.Config.C64Keyboard._8);
CommodoreControls.BindMulti("Key 9", Global.Config.C64Keyboard._9);
CommodoreControls.BindMulti("Key 0", Global.Config.C64Keyboard._0);
CommodoreControls.BindMulti("Key Plus", Global.Config.C64Keyboard.Plus);
Global.Commodore64Controls = CommodoreControls;
var autofireC64Controls = new AutofireController(C64.C64ControllerDefinition);