hans/CnC_Remastered_Collection
1
0
Fork 0
mirror of https://github.com/jmarshall23/CnC_Remastered_Collection.git synced 2026-08-12 08:00:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge branch 'master' into master"

Browse Source 
This reverts commit b91fab3474, reversing
changes made to 78812727c7.
This commit is contained in:
Justin Marshall
2020-07-02 13:42:08 -07:00
parent abfa27fa06
commit 33b9fd94bd
20 changed files with 740 additions and 1075 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/redalert/key.h
+108 -113
View File
@@ -523,126 +523,121 @@ typedef enum KeyASCIIType {
typedef enum KeyNumType {
KN_NONE = 0,
KN_NONE = 0,
KN_0,
KN_1,
KN_2,
KN_3,
KN_4,
KN_5,
KN_6,
KN_7,
KN_8,
KN_9,
KN_A,
KN_B,
KN_C,
KN_D,
KN_E,
KN_F,
KN_G,
KN_H,
KN_I,
KN_J,
KN_K,
KN_L,
KN_M,
KN_N,
KN_O,
KN_P,
KN_Q,
KN_R,
KN_S,
KN_T,
KN_U,
KN_V,
KN_W,
KN_X,
KN_Y,
KN_Z,
KN_BACKSLASH,
KN_BACKSPACE,
KN_CAPSLOCK,
KN_CENTER,
KN_COMMA,
KN_DELETE,
KN_DOWN,
KN_DOWNLEFT,
KN_DOWNRIGHT,
KN_END,
KN_EQUAL,
KN_ESC,
KN_E_DELETE,
KN_E_DOWN,
KN_E_END,
KN_E_HOME,
KN_E_INSERT,
KN_E_LEFT,
KN_E_PGDN,
KN_E_PGUP,
KN_E_RIGHT,
KN_E_UP,
KN_GRAVE,
KN_HOME,
KN_INSERT,
KN_KEYPAD_ASTERISK,
KN_KEYPAD_MINUS,
KN_KEYPAD_PLUS,
KN_KEYPAD_RETURN,
KN_KEYPAD_SLASH,
KN_MINUS,
KN_NUMLOCK,
KN_PAUSE,
KN_PERIOD,
KN_PGDN,
KN_PGUP,
KN_PRNTSCRN,
KN_SCROLLLOCK,
KN_SEMICOLON,
KN_SLASH,
KN_SPACE,
KN_SQUOTE,
KN_TAB,
KN_UP,
KN_UPLEFT,
KN_UPRIGHT,
KN_LALT,
KN_LBRACKET,
KN_LCTRL,
KN_LEFT,
KN_LMOUSE,
KN_LSHIFT,
KN_RALT,
KN_RBRACKET,
KN_RCTRL,
KN_RETURN,
KN_RIGHT,
KN_RMOUSE,
KN_RSHIFT,
KN_F1,
KN_F2,
KN_F3,
KN_F4,
KN_F5,
KN_F6,
KN_F7,
KN_F8,
KN_F9,
KN_F10,
KN_F11,
KN_F12,
KN_0 = VK_0,
KN_1 = VK_1,
KN_2 = VK_2,
KN_3 = VK_3,
KN_4 = VK_4,
KN_5 = VK_5,
KN_6 = VK_6,
KN_7 = VK_7,
KN_8 = VK_8,
KN_9 = VK_9,
KN_A = VK_A,
KN_B = VK_B,
KN_BACKSLASH = VK_NONE_DC,
KN_BACKSPACE = VK_BACK,
KN_C = VK_C,
KN_CAPSLOCK = VK_CAPITAL,
KN_CENTER = VK_CLEAR,
KN_COMMA = VK_NONE_BC,
KN_D = VK_D,
KN_DELETE = VK_DELETE,
KN_DOWN = VK_DOWN,
KN_DOWNLEFT = VK_END,
KN_DOWNRIGHT = VK_NEXT,
KN_E = VK_E,
KN_END = VK_END,
KN_EQUAL = VK_NONE_BB,
KN_ESC = VK_ESCAPE,
KN_E_DELETE = VK_DELETE,
KN_E_DOWN = VK_NUMPAD2,
KN_E_END = VK_NUMPAD1,
KN_E_HOME = VK_NUMPAD7,
KN_E_INSERT = VK_INSERT,
KN_E_LEFT = VK_NUMPAD4,
KN_E_PGDN = VK_NUMPAD3,
KN_E_PGUP = VK_NUMPAD9,
KN_E_RIGHT = VK_NUMPAD6,
KN_E_UP = VK_NUMPAD8,
KN_F = VK_F,
KN_F1 = VK_F1,
KN_F10 = 67,
KN_F11 = 68,
KN_F12 = 69,
KN_F2 = 59,
KN_F3 = 60,
KN_F4 = 61,
KN_F5 = 62,
KN_F6 = 63,
KN_F7 = 64,
KN_F8 = 65,
KN_F9 = 66,
KN_G = VK_G,
KN_GRAVE = VK_NONE_C0,
KN_H = VK_H,
KN_HOME = VK_HOME,
KN_I = VK_I,
KN_INSERT = VK_INSERT,
KN_J = VK_J,
KN_K = VK_K,
KN_KEYPAD_ASTERISK= VK_MULTIPLY,
KN_KEYPAD_MINUS = VK_SUBTRACT,
KN_KEYPAD_PLUS = VK_ADD,
KN_KEYPAD_RETURN = VK_RETURN,
KN_KEYPAD_SLASH = VK_DIVIDE,
KN_L = VK_L,
KN_LALT = VK_MENU,
KN_LBRACKET = VK_NONE_DB,
KN_LCTRL = VK_CONTROL,
KN_LEFT = VK_LEFT,
KN_LMOUSE = VK_LBUTTON,
KN_LSHIFT = VK_SHIFT,
KN_M = VK_M,
KN_MINUS = VK_NONE_BD,
KN_N = VK_N,
KN_NUMLOCK = VK_NUMLOCK,
KN_O = VK_O,
KN_P = VK_P,
KN_PAUSE = VK_PAUSE,
KN_PERIOD = VK_NONE_BE,
KN_PGDN = VK_NEXT,
KN_PGUP = VK_PRIOR,
KN_PRNTSCRN = VK_PRINT,
KN_Q = VK_Q,
KN_R = VK_R,
KN_RALT = VK_MENU,
KN_RBRACKET = VK_NONE_DD,
KN_RCTRL = VK_CONTROL,
KN_RETURN = VK_RETURN,
KN_RIGHT = VK_RIGHT,
KN_RMOUSE = VK_RBUTTON,
KN_RSHIFT = VK_SHIFT,
KN_S = VK_S,
KN_SCROLLLOCK = VK_SCROLL,
KN_SEMICOLON = VK_NONE_BA,
KN_SLASH = VK_NONE_BF,
KN_SPACE = VK_SPACE,
KN_SQUOTE = VK_NONE_DE,
KN_T = VK_T,
KN_TAB = VK_TAB,
KN_U = VK_U,
KN_UP = VK_UP,
KN_UPLEFT = VK_HOME,
KN_UPRIGHT = VK_PRIOR,
KN_V = VK_V,
KN_W = VK_W,
KN_X = VK_X,
KN_Y = VK_Y,
KN_Z = VK_Z,
KN_SHIFT_BIT = WWKEY_SHIFT_BIT,
KN_CTRL_BIT = WWKEY_CTRL_BIT,
KN_ALT_BIT = WWKEY_ALT_BIT,
KN_RLSE_BIT = WWKEY_RLS_BIT,
KN_BUTTON = WWKEY_BTN_BIT,
KN_CAPSLOCK_BIT = WWKEY_SHIFT_BIT,
} KeyNumType;