PROTOCOL_DARKPLACES5

[xonotic/darkplaces.git] / keys.c

diff --git a/keys.c b/keys.c
index e3048b7626a363cc6fd56a8b168aa178d9990692..f1fa5c525f9174365d25e3fe3581eb8cbe639a5c 100644 (file)
--- a/keys.c
+++ b/keys.c
@@ -154,10 +154,22 @@ static const keyname_t   keynames[] = {
        {"KP_ENTER", K_KP_ENTER},
        {"KP_EQUALS", K_KP_EQUALS},
 
-       {"JOY1", K_JOY1},
-       {"JOY2", K_JOY2},
-       {"JOY3", K_JOY3},
-       {"JOY4", K_JOY4},
+       {"JOY1",  K_JOY1},
+       {"JOY2",  K_JOY2},
+       {"JOY3",  K_JOY3},
+       {"JOY4",  K_JOY4},
+       {"JOY5",  K_JOY5},
+       {"JOY6",  K_JOY6},
+       {"JOY7",  K_JOY7},
+       {"JOY8",  K_JOY8},
+       {"JOY9",  K_JOY9},
+       {"JOY10", K_JOY10},
+       {"JOY11", K_JOY11},
+       {"JOY12", K_JOY12},
+       {"JOY13", K_JOY13},
+       {"JOY14", K_JOY14},
+       {"JOY15", K_JOY15},
+       {"JOY16", K_JOY16},
 
        {"AUX1", K_AUX1},
        {"AUX2", K_AUX2},
@@ -272,8 +284,6 @@ Key_Console (int key, char ascii)
                break;
        }
 
-       // LordHavoc: FIXME: implement this sometime
-       #if 0
        if ((toupper(key) == 'V' && keydown[K_CTRL]) || ((key == K_INS || key == K_KP_INS) && keydown[K_SHIFT]))
        {
                char *cbd;
@@ -294,7 +304,6 @@ Key_Console (int key, char ascii)
                }
                return;
        }
-       #endif
 
        if (key == 'l')
        {
@@ -882,7 +891,7 @@ Key_Event (int key, char ascii, qboolean down)
                key_repeats[key]++;
                if (key_repeats[key] > 1) {
                        if ((key_consoleactive && !consolekeys[key]) ||
-                                       (key_dest == key_game &&
+                                       (!key_consoleactive && key_dest == key_game &&
                                         (cls.state == ca_connected && cls.signon == SIGNONS)))
                                return;                                         // ignore most autorepeats
                }