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
This commit is contained in:
Sander van Dijk 2014-09-21 02:10:14 +00:00
parent f7276bc483
commit 5989e7136d
2 changed files with 2 additions and 5 deletions

View file

@ -636,12 +636,12 @@ void IN_SendKeyEvents (void)
else else
lastKeyDown = 0; lastKeyDown = 0;
Key_Event (sym, event.key.state == SDL_PRESSED); Key_Event (sym, event.type == SDL_KEYDOWN);
break; break;
#else #else
sym = IN_SDL_KeysymToQuakeKey(event.key.keysym.sym); 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) && if (event.type == SDL_KEYDOWN && !Key_ConsoleBindable(sym) &&
event.key.keysym.unicode != 0 && (event.key.keysym.unicode & 0xFF80) == 0) event.key.keysym.unicode != 0 && (event.key.keysym.unicode & 0xFF80) == 0)

View file

@ -1140,9 +1140,6 @@ Key_ConsoleBindable
*/ */
qboolean Key_ConsoleBindable(int key) qboolean Key_ConsoleBindable(int key)
{ {
if (key < 0 || key > 255)
return false;
if (Key_StringToKeynum(Key_KeynumToString(key)) == -1) if (Key_StringToKeynum(Key_KeynumToString(key)) == -1)
return false; return false;