From 747115962b9b9a03755ce98a05006653b8259b2b Mon Sep 17 00:00:00 2001 From: adelikat Date: Thu, 6 Dec 2012 01:19:32 +0000 Subject: [PATCH] C64 - hook up Lock key to core, doesn't do anything yet though --- BizHawk.Emulation/Computers/Commodore64/C64.cs | 2 +- BizHawk.MultiClient/MainForm.cs | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/BizHawk.Emulation/Computers/Commodore64/C64.cs b/BizHawk.Emulation/Computers/Commodore64/C64.cs index 351cc4bdf3..c5c743f780 100644 --- a/BizHawk.Emulation/Computers/Commodore64/C64.cs +++ b/BizHawk.Emulation/Computers/Commodore64/C64.cs @@ -80,7 +80,7 @@ namespace BizHawk.Emulation.Computers.Commodore64 "Key 1", "Key Left Arrow", "Key Control", "Key 2", "Key Space", "Key Commodore", "Key Q", "Key Run/Stop", "P1 Up", "P1 Down", "P1 Left", "P1 Right", "P1 Button", "P2 Up", "P2 Down", "P2 Left", "P2 Right", "P2 Button", - "Key Restore" + "Key Restore", "Key Lck" } }; diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index 3df9895213..5ae5ba903f 100644 --- a/BizHawk.MultiClient/MainForm.cs +++ b/BizHawk.MultiClient/MainForm.cs @@ -1200,8 +1200,6 @@ namespace BizHawk.MultiClient CommodoreControls.BindMulti("Key Cursor Up/Down", Global.Config.C64Keyboard.Cursor_Up_Down); CommodoreControls.BindMulti("Key Cursor Left/Right", Global.Config.C64Keyboard.Cursor_Left_Right); CommodoreControls.BindMulti("Key Space", Global.Config.C64Keyboard.Space); - - Global.Commodore64Controls = CommodoreControls;