fixed keynum_t issue, it was declared as an extern variable (?!?) in the header,...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5848 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/keys.h b/keys.h
index 51d0691b24e41ce82e2e3e14fc78868dda5194ea..3736ac4d561419af08bbf85197d1bf3a591b4fa3 100644 (file)
--- a/keys.h
+++ b/keys.h
@@ -32,7 +32,7 @@
 //
 // these are the key numbers that should be passed to Key_Event
 //
-extern enum keynum_e
+typedef enum keynum_e
 {
        K_TAB                   = 9,
        K_ENTER                 = 13,

diff --git a/vid_glx.c b/vid_glx.c
index 35187f269a9636274f22d809e8ac8219d716c2c9..cc503fda5e474a92d26b2b52e18a40d0c5fac42e 100644 (file)
--- a/vid_glx.c
+++ b/vid_glx.c
@@ -316,7 +316,7 @@ static void IN_Activate (qboolean grab)
        }
 }
 
-static int buttonremap[18] =
+static keynum_t buttonremap[18] =
 {
        K_MOUSE1,
        K_MOUSE3,

diff --git a/vid_sdl.c b/vid_sdl.c
index 9047dd36e5176ab34ddaf507eb18c2e7004a87ca..2580104f1b6e16f385bb37d3b550606c2d71fe76 100644 (file)
--- a/vid_sdl.c
+++ b/vid_sdl.c
@@ -251,7 +251,7 @@ static int Sys_EventFilter( SDL_Event *event )
 #endif
 }
 
-static int buttonremap[16] =
+static keynum_t buttonremap[16] =
 {
        K_MOUSE1,
        K_MOUSE3,

diff --git a/vid_wgl.c b/vid_wgl.c
index 5b6f4b4b770923af94abbe410f21488c08de1c23..8c1180084e5fe19ddcb4624e63459b50b8473bbe 100644 (file)
--- a/vid_wgl.c
+++ b/vid_wgl.c
@@ -469,7 +469,7 @@ void Sys_SendKeyEvents (void)
 
 LONG CDAudio_MessageHandler(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
-static int buttonremap[16] =
+static keynum_t buttonremap[16] =
 {
        K_MOUSE1,
        K_MOUSE2,