From 5989e7136d519de355371cf79aa5cb673a6f69a0 Mon Sep 17 00:00:00 2001 From: Sander van Dijk Date: Sun, 21 Sep 2014 02:10:14 +0000 Subject: [PATCH] Minor cleanups. in_keys.c: Key_ConsoleBindable: remove redundant check, this is now handled by Key_KeynumToString/Key_StringToKeynum. in_sdl.c: IN_SendKeyEvents: use a single method for checking whether we have a keydown or keyup event. git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1047 af15c1b1-3010-417e-b628-4374ebc0bcbd --- Quake/in_sdl.c | 4 ++-- Quake/keys.c | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Quake/in_sdl.c b/Quake/in_sdl.c index 6c66390e..17e89276 100644 --- a/Quake/in_sdl.c +++ b/Quake/in_sdl.c @@ -636,12 +636,12 @@ void IN_SendKeyEvents (void) else lastKeyDown = 0; - Key_Event (sym, event.key.state == SDL_PRESSED); + Key_Event (sym, event.type == SDL_KEYDOWN); break; #else sym = IN_SDL_KeysymToQuakeKey(event.key.keysym.sym); - Key_Event (sym, event.key.state == SDL_PRESSED); + Key_Event (sym, event.type == SDL_KEYDOWN); if (event.type == SDL_KEYDOWN && !Key_ConsoleBindable(sym) && event.key.keysym.unicode != 0 && (event.key.keysym.unicode & 0xFF80) == 0) diff --git a/Quake/keys.c b/Quake/keys.c index 5a7e4a34..14c08316 100644 --- a/Quake/keys.c +++ b/Quake/keys.c @@ -1140,9 +1140,6 @@ Key_ConsoleBindable */ qboolean Key_ConsoleBindable(int key) { - if (key < 0 || key > 255) - return false; - if (Key_StringToKeynum(Key_KeynumToString(key)) == -1) return false;