From 13a10c2e2974e55533e175cdb78c5f114beb5966 Mon Sep 17 00:00:00 2001 From: Tom Hicks Date: Sun, 26 Jun 2005 13:10:41 -0400 Subject: [PATCH] Added: Surrounded the entire with an ifdef ~g2k --- include/keys.h | 214 +++++++++++++++++++++++++------------------------ 1 file changed, 110 insertions(+), 104 deletions(-) diff --git a/include/keys.h b/include/keys.h index 793649d..2996ae5 100644 --- a/include/keys.h +++ b/include/keys.h @@ -1,3 +1,5 @@ +#ifndef __keys_h__ +#define __keys_h__ //Everything in this file will be abstracted by oa_input //These definitions will be replaced at that time #ifdef WIN32 @@ -70,108 +72,112 @@ #endif #ifdef __linux -enum Keys{ - KEY_UNKNOWN = 0, - KEY_LBUTTON, - KEY_RBUTTON, - KEY_MBUTTON, - KEY_LEFT, - KEY_RIGHT, - KEY_UP, - KEY_DOWN, - KEY_SPACE, - KEY_RETURN, - KEY_SHIFT, - KEY_PAUSE, - KEY_CONTROL, - KEY_CAPITAL, - KEY_ESCAPE, - KEY_PRIOR, - KEY_NEXT, - KEY_END, - KEY_HOME, - KEY_INSERT, - KEY_DELETE, - KEY_LWIN, - KEY_RWIN, - KEY_APPS, - KEY_NUMPAD0, - KEY_NUMPAD1, - KEY_NUMPAD2, - KEY_NUMPAD3, - KEY_NUMPAD4, - KEY_NUMPAD5, - KEY_NUMPAD6, - KEY_NUMPAD7, - KEY_NUMPAD8, - KEY_NUMPAD9, - KEY_MULTIPLY, - KEY_ADD, - KEY_SUBTRACT, - KEY_DIVIDE, - KEY_F1, - KEY_F2, - KEY_F3, - KEY_F4, - KEY_F5, - KEY_F6, - KEY_F7, - KEY_F8, - KEY_F9, - KEY_F10, - KEY_F11, - KEY_F12, - KEY_NUMLOCK, - KEY_SCROLL, - KEY_SEPARATOR, - KEY_OEM_1, - KEY_OEM_2, - KEY_OEM_3, - KEY_OEM_4, - KEY_OEM_5, - KEY_OEM_6, - KEY_OEM_7, - KEY_OEM_PERIOD, - KEY_OEM_PLUS, - KEY_OEM_MINUS, - KEY_OEM_COMMA, - KEY_BACK, - KEY_TAB, - KEY_0, - KEY_1, - KEY_2, - KEY_3, - KEY_4, - KEY_5, - KEY_6, - KEY_7, - KEY_8, - KEY_9, - KEY_A, - KEY_B, - KEY_C, - KEY_D, - KEY_E, - KEY_F, - KEY_G, - KEY_H, - KEY_I, - KEY_J, - KEY_K, - KEY_L, - KEY_M, - KEY_N, - KEY_O, - KEY_P, - KEY_Q, - KEY_R, - KEY_S, - KEY_T, - KEY_U, - KEY_V, - KEY_W, - KEY_X, - KEY_Y, - KEY_Z -} +namespace OpenArena +{ + enum Keys{ + KEY_UNKNOWN = 0, + KEY_LBUTTON, + KEY_RBUTTON, + KEY_MBUTTON, + KEY_LEFT, + KEY_RIGHT, + KEY_UP, + KEY_DOWN, + KEY_SPACE, + KEY_RETURN, + KEY_SHIFT, + KEY_PAUSE, + KEY_CONTROL, + KEY_CAPITAL, + KEY_ESCAPE, + KEY_PRIOR, + KEY_NEXT, + KEY_END, + KEY_HOME, + KEY_INSERT, + KEY_DELETE, + KEY_LWIN, + KEY_RWIN, + KEY_APPS, + KEY_NUMPAD0, + KEY_NUMPAD1, + KEY_NUMPAD2, + KEY_NUMPAD3, + KEY_NUMPAD4, + KEY_NUMPAD5, + KEY_NUMPAD6, + KEY_NUMPAD7, + KEY_NUMPAD8, + KEY_NUMPAD9, + KEY_MULTIPLY, + KEY_ADD, + KEY_SUBTRACT, + KEY_DIVIDE, + KEY_F1, + KEY_F2, + KEY_F3, + KEY_F4, + KEY_F5, + KEY_F6, + KEY_F7, + KEY_F8, + KEY_F9, + KEY_F10, + KEY_F11, + KEY_F12, + KEY_NUMLOCK, + KEY_SCROLL, + KEY_SEPARATOR, + KEY_OEM_1, + KEY_OEM_2, + KEY_OEM_3, + KEY_OEM_4, + KEY_OEM_5, + KEY_OEM_6, + KEY_OEM_7, + KEY_OEM_PERIOD, + KEY_OEM_PLUS, + KEY_OEM_MINUS, + KEY_OEM_COMMA, + KEY_BACK, + KEY_TAB, + KEY_0, + KEY_1, + KEY_2, + KEY_3, + KEY_4, + KEY_5, + KEY_6, + KEY_7, + KEY_8, + KEY_9, + KEY_A, + KEY_B, + KEY_C, + KEY_D, + KEY_E, + KEY_F, + KEY_G, + KEY_H, + KEY_I, + KEY_J, + KEY_K, + KEY_L, + KEY_M, + KEY_N, + KEY_O, + KEY_P, + KEY_Q, + KEY_R, + KEY_S, + KEY_T, + KEY_U, + KEY_V, + KEY_W, + KEY_X, + KEY_Y, + KEY_Z + }; +}; +#endif #endif