if (key == K_DEL) // delete char on cursor
{
- if (key_linepos < strlen(key_lines[edit_line]))
+ if ((size_t)key_linepos < strlen(key_lines[edit_line]))
strcpy(key_lines[edit_line] + key_linepos, key_lines[edit_line] + key_linepos + 1);
return;
}
// otherwise just go right one
if (key == K_RIGHTARROW)
{
- if (strlen(key_lines[edit_line]) == key_linepos)
+ if (strlen(key_lines[edit_line]) == (size_t)key_linepos)
{
- if (strlen(key_lines[(edit_line + 31) & 31]) <= key_linepos)
+ if (strlen(key_lines[(edit_line + 31) & 31]) <= (size_t)key_linepos)
return; // no character to get
key_lines[edit_line][key_linepos] = key_lines[(edit_line + 31) & 31][key_linepos];
if (key == K_PGUP || key==K_MWHEELUP)
{
- con_backscroll += 2;
+ con_backscroll += ((int) scr_conlines >> 4);
if (con_backscroll > con_totallines - (vid.conheight>>3) - 1)
con_backscroll = con_totallines - (vid.conheight>>3) - 1;
return;
if (key == K_PGDN || key==K_MWHEELDOWN)
{
- con_backscroll -= 2;
+ con_backscroll -= ((int) scr_conlines >> 4);
if (con_backscroll < 0)
con_backscroll = 0;
return;
the K_* names are matched up.
===================
*/
-int Key_StringToKeynum (char *str)
+int Key_StringToKeynum (const char *str)
{
- keyname_t *kn;
+ keyname_t *kn;
if (!str || !str[0])
return -1;
return str[0];
for (kn=keynames ; kn->name ; kn++)
- {
if (!Q_strcasecmp(str,kn->name))
return kn->keynum;
- }
return -1;
}
*/
char *Key_KeynumToString (int keynum)
{
- keyname_t *kn;
- static char tinystr[2];
+ keyname_t *kn;
+ static char tinystr[2];
if (keynum == -1)
return "<KEY NOT FOUND>";
tinystr[1] = 0;
return tinystr;
}
-
+
for (kn=keynames ; kn->name ; kn++)
if (keynum == kn->keynum)
return kn->name;
char *new;
int l;
- if (keynum == -1)
+ if (keynum < 0 || keynum >= 256)
return;
// free old bindings
{
if (!down)
return;
- if (key_consoleactive)
- M_ToggleMenu_f ();
- else
+ switch (key_dest)
{
- switch (key_dest)
- {
- case key_message:
- Key_Message (key);
- break;
- case key_menu:
- M_Keydown (key);
- break;
- case key_game:
- //case key_console:
- M_ToggleMenu_f ();
- break;
- default:
- Sys_Error ("Bad key_dest");
- }
+ case key_message:
+ Key_Message (key);
+ break;
+ case key_menu:
+ M_Keydown (key);
+ break;
+ case key_game:
+ M_ToggleMenu_f ();
+ break;
+ default:
+ Sys_Error ("Bad key_dest");
}
return;
}