projects
/
supertux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8db371b
)
Fixed crash when enabling console
author
Ingo Ruhnke
<grumbel@gmail.com>
Wed, 30 Jul 2014 18:32:30 +0000
(20:32 +0200)
committer
Ingo Ruhnke
<grumbel@gmail.com>
Wed, 30 Jul 2014 18:32:30 +0000
(20:32 +0200)
src/supertux/screen_manager.cpp
patch
|
blob
|
history
diff --git
a/src/supertux/screen_manager.cpp
b/src/supertux/screen_manager.cpp
index
353f209
..
add990f
100644
(file)
--- a/
src/supertux/screen_manager.cpp
+++ b/
src/supertux/screen_manager.cpp
@@
-191,7
+191,6
@@
void
ScreenManager::process_events()
{
g_jk_controller->update();
-const Uint8 *keystate = SDL_GetKeyboardState(NULL); //edited by giby
SDL_Event event;
while(SDL_PollEvent(&event))
{
@@
-234,8
+233,7
@@
const Uint8 *keystate = SDL_GetKeyboardState(NULL); //edited by giby
take_screenshot();
}
else if (event.key.keysym.sym == SDLK_F1 &&
- (keystate[SDLK_LCTRL] || keystate[SDLK_RCTRL]) &&
- keystate[SDLK_c])
+ event.key.keysym.mod & KMOD_CTRL)
{
Console::instance->toggle();
g_config->console_enabled = true;