X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fmainloop.cpp;h=6a9bb042d070b85d899f9001d674dbad78982cdd;hb=a2f888ab04304eeb589e60ad1b17c86f3a2ae957;hp=1f341508ec6925098e87f7f2bbd2b3443271c7a3;hpb=20b1c27dacf592c4f82fa8772d135ca9b7375d45;p=supertux.git

diff --git a/src/mainloop.cpp b/src/mainloop.cpp
index 1f341508e..6a9bb042d 100644
--- a/src/mainloop.cpp
+++ b/src/mainloop.cpp
@@ -180,6 +180,7 @@ void
 MainLoop::process_events()
 {
   main_controller->update();
+  Uint8* keystate = SDL_GetKeyState(NULL);
   SDL_Event event;
   while(SDL_PollEvent(&event)) 
     {
@@ -200,15 +201,29 @@ MainLoop::process_events()
             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();
+                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();
               }
+            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;
         }
     }
@@ -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
-      // elapsed_ticks grows extremly large, so we just ignore those
+      // elapsed_ticks grows extremely large, so we just ignore those
       // large time jumps
       elapsed_ticks = 0;
     }