dhewm/dhewm3
0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3.git synced 2025-03-21 02:01:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #75 from hurikhan/SDL2

Browse source 
Fix compilation with SDL2 release
This commit is contained in:
Daniel Gibson 2013-08-13 13:56:48 -07:00
commit 0aca42a0d8
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
neo/sys/events.cpp
View file

@ -481,10 +481,9 @@ sysEvent_t Sys_GetEvent() {
// fall through
case SDL_KEYUP:
key = mapkey(ev.key.keysym.sym);
#if !SDL_VERSION_ATLEAST(2, 0, 0)
if (!key) {
unsigned char c;
// check if its an unmapped console key
if (ev.key.keysym.unicode == (c = Sys_GetConsoleKey(false))) {
key = c;
@ -496,6 +495,20 @@ sysEvent_t Sys_GetEvent() {
return res_none;
}
}
#else
if(!key) {
if (ev.key.keysym.scancode == SDL_SCANCODE_GRAVE) {
key = Sys_GetConsoleKey(true);
} else {
if (ev.type == SDL_KEYDOWN) {
common->Warning("unmapped SDL key %d", ev.key.keysym.sym);
return res_none;
}
}
}
#endif
res.evType = SE_KEY;
res.evValue = key;