From 83c152c43497223da3adad2e52e2221efd9087c4 Mon Sep 17 00:00:00 2001 From: Mark Olsen Date: Mon, 6 Mar 2023 06:54:38 +0000 Subject: [PATCH] Use KN_ key defines instead of VK_ key defines in generic code. This also fixes being able to use the right shift, control and alt keys in the SDL version. --- common/wwkeyboard.cpp | 8 ++++---- common/wwkeyboard.h | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/common/wwkeyboard.cpp b/common/wwkeyboard.cpp index 2b9960ba..b7f2d683 100644 --- a/common/wwkeyboard.cpp +++ b/common/wwkeyboard.cpp @@ -134,7 +134,7 @@ unsigned short WWKeyboardClass::Buff_Get(void) bool WWKeyboardClass::Is_Mouse_Key(unsigned short key) { key &= 0xFF; - return (key == VK_LBUTTON || key == VK_MBUTTON || key == VK_RBUTTON); + return (key == KN_LMOUSE || key == KN_MMOUSE || key == KN_RMOUSE); } /*********************************************************************************************** @@ -219,13 +219,13 @@ bool WWKeyboardClass::Put_Key_Message(unsigned short vk_key, bool release) ** would be incompatible with the dos version. */ if (!Is_Mouse_Key(vk_key)) { - if (Down(VK_SHIFT) || Down(VK_CAPITAL) || Down(VK_NUMLOCK)) { + if (Down(KN_LSHIFT) || Down(KN_RSHIFT) || Down(KN_CAPSLOCK) || Down(KN_NUMLOCK)) { vk_key |= WWKEY_SHIFT_BIT; } - if (Down(VK_CONTROL)) { + if (Down(KN_LCTRL) || Down(KN_RCTRL)) { vk_key |= WWKEY_CTRL_BIT; } - if (Down(VK_MENU)) { + if (Down(KN_LALT) || Down(KN_RALT)) { vk_key |= WWKEY_ALT_BIT; } } diff --git a/common/wwkeyboard.h b/common/wwkeyboard.h index 1e37a05f..e49f364a 100644 --- a/common/wwkeyboard.h +++ b/common/wwkeyboard.h @@ -780,6 +780,7 @@ typedef enum KeyNumType : unsigned short KN_LSHIFT = VK_SHIFT, KN_M = VK_M, KN_MINUS = VK_NONE_BD, + KN_MMOUSE = VK_MBUTTON, KN_N = VK_N, KN_NUMLOCK = VK_NUMLOCK, KN_O = VK_O,