eliminated qbyte type, now uses unsigned char throughout the engine for this purpose

[xonotic/darkplaces.git] / keys.c

diff --git a/keys.c b/keys.c
index cfd62813b12f54082f7c580aa333416093d12a04..3df1d01e5873c0a15510d2b06039d654f0d6b328 100644 (file)
--- a/keys.c
+++ b/keys.c
@@ -37,12 +37,14 @@ int                 key_consoleactive;
 char           *keybindings[MAX_BINDMAPS][MAX_KEYS];
 
 static int     key_bmap, key_bmap2;
-static qbyte keydown[MAX_KEYS];        // 0 = up, 1 = down, 2 = repeating
+static unsigned char keydown[MAX_KEYS];        // 0 = up, 1 = down, 2 = repeating
 
-typedef struct {
+typedef struct keyname_s
+{
        const char      *name;
        int                     keynum;
-} keyname_t;
+}
+keyname_t;
 
 static const keyname_t   keynames[] = {
        {"TAB", K_TAB},
@@ -272,7 +274,7 @@ Key_Console (int key, char ascii)
                {
                        int i;
                        strtok(cbd, "\n\r\b");
-                       i = strlen(cbd);
+                       i = (int)strlen(cbd);
                        if (i + key_linepos >= MAX_INPUTLINE)
                                i= MAX_INPUTLINE - key_linepos;
                        if (i > 0)
@@ -348,7 +350,7 @@ Key_Console (int key, char ascii)
        // delete char on cursor
        if (key == K_DEL || key == K_KP_DEL)
        {
-               if ((size_t)key_linepos < strlen(key_lines[edit_line]))
+               if (key_linepos < (int)strlen(key_lines[edit_line]))
                        strcpy(key_lines[edit_line] + key_linepos, key_lines[edit_line] + key_linepos + 1);
                return;
        }
@@ -358,7 +360,7 @@ Key_Console (int key, char ascii)
        // otherwise just go right one
        if (key == K_RIGHTARROW || key == K_KP_RIGHTARROW)
        {
-               if ((size_t)key_linepos < strlen(key_lines[edit_line]))
+               if (key_linepos < (int)strlen(key_lines[edit_line]))
                        key_linepos++;
 
                return;
@@ -378,7 +380,7 @@ Key_Console (int key, char ascii)
                {
                        history_line--;
                        strcpy(key_lines[edit_line], key_lines[history_line]);
-                       key_linepos = strlen(key_lines[edit_line]);
+                       key_linepos = (int)strlen(key_lines[edit_line]);
                }
                return;
        }
@@ -396,7 +398,7 @@ Key_Console (int key, char ascii)
                else
                {
                        strcpy(key_lines[edit_line], key_lines[history_line]);
-                       key_linepos = strlen(key_lines[edit_line]);
+                       key_linepos = (int)strlen(key_lines[edit_line]);
                }
                return;
        }
@@ -436,7 +438,7 @@ Key_Console (int key, char ascii)
        if (key_linepos < MAX_INPUTLINE-1)
        {
                int len;
-               len = strlen(&key_lines[edit_line][key_linepos]);
+               len = (int)strlen(&key_lines[edit_line][key_linepos]);
                // check insert mode, or always insert if at end of line
                if (key_insert || len == 0)
                {
@@ -553,8 +555,8 @@ Key_KeynumToString (int keynum)
 void
 Key_SetBinding (int keynum, int bindmap, const char *binding)
 {
-       char       *new;
-       int         l;
+       char *newbinding;
+       size_t l;
 
        if (keynum == -1)
                return;
@@ -566,10 +568,10 @@ Key_SetBinding (int keynum, int bindmap, const char *binding)
        }
 // allocate memory for new binding
        l = strlen (binding);
-       new = Z_Malloc (l + 1);
-       strcpy (new, binding);
-       new[l] = 0;
-       keybindings[bindmap][keynum] = new;
+       newbinding = (char *)Z_Malloc (l + 1);
+       strcpy (newbinding, binding);
+       newbinding[l] = 0;
+       keybindings[bindmap][keynum] = newbinding;
 }
 
 static void
@@ -839,7 +841,7 @@ Key_Event (int key, char ascii, qboolean down)
                // key_menu - go to parent menu (or key_game)
                // key_game - open menu
                // in all modes shift-escape toggles console
-               if (key_consoleactive || keydown[K_SHIFT])
+               if ((key_consoleactive & KEY_CONSOLEACTIVE_USER) || keydown[K_SHIFT])
                {
                        Con_ToggleConsole_f ();
                        return;