Fixing a few compiler errors, thanks to bluescreen_avenger at verizon dot net

[supertux.git] / src / supertux / screen_manager.cpp

diff --git a/src/supertux/screen_manager.cpp b/src/supertux/screen_manager.cpp
index 493aaec..36fdc11 100644 (file)
--- a/src/supertux/screen_manager.cpp
+++ b/src/supertux/screen_manager.cpp
@@ -35,6 +35,7 @@
 #include "video/drawing_context.hpp"
 #include "video/renderer.hpp"
 
+#include <stdio.h>
 /** ticks (as returned from SDL_GetTicks) per frame */
 static const Uint32 TICKS_PER_FRAME = (Uint32) (1000.0 / LOGICAL_FPS);
 /** don't skip more than every 2nd frame */
@@ -189,12 +190,12 @@ ScreenManager::update_gamelogic(float elapsed_time)
 void
 ScreenManager::process_events()
 {
-  g_main_controller->update();
-  Uint8* keystate = SDL_GetKeyState(NULL);
+  g_jk_controller->update();
+const Uint8 *keystate =  SDL_GetKeyboardState(NULL); //edited by giby
   SDL_Event event;
   while(SDL_PollEvent(&event)) 
   {
-    g_main_controller->process_event(event);
+    g_jk_controller->process_event(event);
 
     if(MenuManager::current() != NULL)
       MenuManager::current()->event(event);
@@ -205,10 +206,10 @@ ScreenManager::process_events()
         quit();
         break;
               
-      case SDL_VIDEORESIZE:
-        Renderer::instance()->resize(event.resize.w, event.resize.h);
-        MenuManager::recalc_pos();
-        break;
+    //  case SDL_ResizeEvent: //edit by giby
+    //    Renderer::instance()->resize(event.resize.w, event.resize.h);
+    //    MenuManager::recalc_pos();
+    //    break;
             
       case SDL_KEYDOWN:
         if (event.key.keysym.sym == SDLK_F10)
@@ -221,7 +222,7 @@ ScreenManager::process_events()
           Renderer::instance()->apply_config();
           MenuManager::recalc_pos();
         }
-        else if (event.key.keysym.sym == SDLK_PRINT ||
+        else if (event.key.keysym.sym == SDLK_PRINTSCREEN ||
                  event.key.keysym.sym == SDLK_F12)
         {
           take_screenshot();