From c130aa7a3628e563b7ac572e0ce8530b83f250dc Mon Sep 17 00:00:00 2001 From: Soren Jorvang Date: Sat, 5 Jun 2010 19:17:17 +0000 Subject: [PATCH] Accept more special keys in previous. Still doesn't make arrow keys work, though. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5623 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Plugins/Plugin_GCPad/Src/GCPad.cpp | 6 +++--- Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp | 4 ++-- Source/Plugins/Plugin_Wiimote/Src/main.cpp | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Source/Plugins/Plugin_GCPad/Src/GCPad.cpp b/Source/Plugins/Plugin_GCPad/Src/GCPad.cpp index c190609ffb..18cff3ed49 100644 --- a/Source/Plugins/Plugin_GCPad/Src/GCPad.cpp +++ b/Source/Plugins/Plugin_GCPad/Src/GCPad.cpp @@ -244,14 +244,14 @@ void EmuStateChange(PLUGIN_EMUSTATE newState) } // Hack to use wx key events -volatile bool wxkeystate[256]; +volatile bool wxkeystate[400]; // Set buttons status from keyboard input. Currently this is done from wxWidgets in the main application. // -------------- void PAD_Input(u16 _Key, u8 _UpDown) { #if defined(__APPLE__) && defined(USE_WX) && USE_WX - if (_Key < 256) + if (_Key < 400) { wxkeystate[_Key] = _UpDown; } @@ -634,7 +634,7 @@ bool IsKey(int Key) } else if (MapKey < 0x1100) #elif defined (USE_WX) && USE_WX - if (MapKey < 256) { + if (MapKey < 400) { Ret = wxkeystate[MapKey]; } else if (MapKey < 0x1100) diff --git a/Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp b/Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp index d8bb72df90..8e14d4b223 100644 --- a/Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp +++ b/Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp @@ -35,7 +35,7 @@ extern SWiimoteInitialize g_WiimoteInitialize; // Hack to use wx key events -extern volatile bool wxkeystate[256]; +extern volatile bool wxkeystate[400]; namespace WiiMoteEmu { @@ -323,7 +323,7 @@ bool IsKey(int Key) } else if (MapKey < 0x1100) #elif defined (USE_WX) && USE_WX - if (MapKey < 256) { + if (MapKey < 400) { Ret = wxkeystate[MapKey]; } else if (MapKey < 0x1100) diff --git a/Source/Plugins/Plugin_Wiimote/Src/main.cpp b/Source/Plugins/Plugin_Wiimote/Src/main.cpp index 25273b7d86..d836e08791 100644 --- a/Source/Plugins/Plugin_Wiimote/Src/main.cpp +++ b/Source/Plugins/Plugin_Wiimote/Src/main.cpp @@ -295,7 +295,7 @@ void EmuStateChange(PLUGIN_EMUSTATE newState) } // Hack to use wx key events -volatile bool wxkeystate[256]; +volatile bool wxkeystate[400]; // Set buttons status from keyboard input. Currently this is done from // wxWidgets in the main application. @@ -303,7 +303,7 @@ volatile bool wxkeystate[256]; void Wiimote_Input(u16 _Key, u8 _UpDown) { #if defined(__APPLE__) && defined(USE_WX) && USE_WX - if (_Key < 256) + if (_Key < 400) { wxkeystate[_Key] = _UpDown; }