Made gl_picmip affect only maps, models, and sprites by setting their TEXF_PICMIP...

[xonotic/darkplaces.git] / keys.c

diff --git a/keys.c b/keys.c
index 922ef11ea7245246ca20d7573646fcca51cfd67d..d4935d0564a9bc6d441a97913023cc27e7ccde71 100644 (file)
--- a/keys.c
+++ b/keys.c
@@ -272,8 +272,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 +292,6 @@ Key_Console (int key, char ascii)
                }
                return;
        }
-       #endif
 
        if (key == 'l')
        {
@@ -822,6 +819,7 @@ Key_Init (void)
        consolekeys[K_DOWNARROW] = true; consolekeys[K_KP_DOWNARROW] = true;
        consolekeys[K_BACKSPACE] = true;
        consolekeys[K_DEL] = true; consolekeys[K_KP_DEL] = true;
+       consolekeys[K_INS] = true; consolekeys[K_KP_INS] = true;
        consolekeys[K_HOME] = true; consolekeys[K_KP_HOME] = true;
        consolekeys[K_END] = true; consolekeys[K_KP_END] = true;
        consolekeys[K_PGUP] = true; consolekeys[K_KP_PGUP] = true;
@@ -829,6 +827,10 @@ Key_Init (void)
        consolekeys[K_SHIFT] = true;
        consolekeys[K_MWHEELUP] = true;
        consolekeys[K_MWHEELDOWN] = true;
+       consolekeys[K_KP_PLUS] = true;
+       consolekeys[K_KP_MINUS] = true;
+       consolekeys[K_KP_DIVIDE] = true;
+       consolekeys[K_KP_MULTIPLY] = true;
        consolekeys['`'] = false;
        consolekeys['~'] = false;
 
@@ -877,7 +879,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
                }