wowgetoffyourcellphone/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fix missing 'else return' in isPressed following 12cceed3d9

Browse Source 
Reported by Vladislavbelov & nephele

This was SVN commit r24650.
This commit is contained in:
wraitii 2021-01-16 17:16:02 +00:00
parent e9fa4445f5
commit 1eb342c595
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/ps/Hotkey.cpp
View File

@ -109,14 +109,15 @@ bool isPressed(const SKey& key)
// Normal keycodes are below EXTRA_KEYS_BASE
if ((int)key.code < EXTRA_KEYS_BASE)
return g_scancodes[key.code];
// Mouse 'keycodes' are after the modifier keys
else if ((int)key.code < MOUSE_LAST && (int)key.code > MOUSE_BASE)
return g_mouse_buttons[key.code - MOUSE_BASE];
// Modifier keycodes are between the normal keys and the mouse 'keys'
else if ((int)key.code < UNIFIED_LAST && (int)key.code > SDL_NUM_SCANCODES)
return unified[key.code - UNIFIED_SHIFT];
// This codepath shouldn't be taken, but not having it triggers warnings.
else
return false;
}
InReaction HotkeyStateChange(const SDL_Event_* ev)