projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No more segfaults when trying to spawn bullets of unknown type
[supertux.git]
/
src
/
mainloop.cpp
diff --git
a/src/mainloop.cpp
b/src/mainloop.cpp
index
1f34150
..
6a9bb04
100644
(file)
--- a/
src/mainloop.cpp
+++ b/
src/mainloop.cpp
@@
-180,6
+180,7
@@
void
MainLoop::process_events()
{
main_controller->update();
MainLoop::process_events()
{
main_controller->update();
+ Uint8* keystate = SDL_GetKeyState(NULL);
SDL_Event event;
while(SDL_PollEvent(&event))
{
SDL_Event event;
while(SDL_PollEvent(&event))
{
@@
-200,15
+201,29
@@
MainLoop::process_events()
break;
case SDL_KEYDOWN:
break;
case SDL_KEYDOWN:
+ if (event.key.keysym.sym == SDLK_F10)
+ {
+ config->show_fps = !config->show_fps;
+ }
if (event.key.keysym.sym == SDLK_F11)
{
config->use_fullscreen = !config->use_fullscreen;
init_video();
if (event.key.keysym.sym == SDLK_F11)
{
config->use_fullscreen = !config->use_fullscreen;
init_video();
+ Menu::recalc_pos();
}
}
- else if (event.key.keysym.sym == SDLK_PRINT)
+ else if (event.key.keysym.sym == SDLK_PRINT ||
+ event.key.keysym.sym == SDLK_F12)
{
take_screenshot();
}
{
take_screenshot();
}
+ else if (event.key.keysym.sym == SDLK_F1 &&
+ (keystate[SDLK_LCTRL] || keystate[SDLK_RCTRL]) &&
+ keystate[SDLK_c])
+ {
+ Console::instance->toggle();
+ config->console_enabled = true;
+ config->save();
+ }
break;
}
}
break;
}
}
@@
-268,7
+283,7
@@
MainLoop::run(DrawingContext &context)
if (elapsed_ticks > ticks_per_frame*4) {
// when the game loads up or levels are switched the
if (elapsed_ticks > ticks_per_frame*4) {
// when the game loads up or levels are switched the
- // elapsed_ticks grows extremly large, so we just ignore those
+ // elapsed_ticks grows extrem
e
ly large, so we just ignore those
// large time jumps
elapsed_ticks = 0;
}
// large time jumps
elapsed_ticks = 0;
}