changed the flat bump texture (for no bumpmap textures) to have a 128 height instead...

[xonotic/darkplaces.git] / keys.c

diff --git a/keys.c b/keys.c
index dd9e182e551de796acf3972e657af82b9f1dfe98..37f33affb851df013b02f7a200311384984034fc 100644 (file)
--- a/keys.c
+++ b/keys.c
@@ -1,6 +1,4 @@
 /*
-       $RCSfile$
-
        Copyright (C) 1996-1997  Id Software, Inc.
 
        This program is free software; you can redistribute it and/or
@@ -20,13 +18,9 @@
                Free Software Foundation, Inc.
                59 Temple Place - Suite 330
                Boston, MA  02111-1307, USA
-
 */
-static const char rcsid[] =
-    "$Id$";
 
 #include "quakedef.h"
-#include <ctype.h>
 
 
 /*
@@ -325,10 +319,7 @@ Key_Console (int key, char ascii)
                key_linepos = 1;
                // force an update, because the command may take some time
                if (cls.state == ca_disconnected)
-               {
                        CL_UpdateScreen ();
-                       CL_UpdateScreen ();
-               }
                return;
        }
 
@@ -438,7 +429,7 @@ Key_Console (int key, char ascii)
 
        if (key == K_PGUP || key == K_KP_PGUP || key == K_MWHEELUP)
        {
-               con_backscroll += ((int) scr_conlines >> 4);
+               con_backscroll += ((int) vid.conheight >> 5);
                if (con_backscroll > con_totallines - (vid.conheight>>3) - 1)
                        con_backscroll = con_totallines - (vid.conheight>>3) - 1;
                return;
@@ -446,7 +437,7 @@ Key_Console (int key, char ascii)
 
        if (key == K_PGDN || key == K_KP_PGDN || key == K_MWHEELDOWN)
        {
-               con_backscroll -= ((int) scr_conlines >> 4);
+               con_backscroll -= ((int) vid.conheight >> 5);
                if (con_backscroll < 0)
                        con_backscroll = 0;
                return;
@@ -549,7 +540,7 @@ the given string.  Single ascii characters return themselves, while
 the K_* names are matched up.
 ===================
 */
-static int
+int
 Key_StringToKeynum (const char *str)
 {
        const keyname_t  *kn;