Merge branch 'master' into lpc2012lpc2012

1 files changed, 2 insertions, 4 deletions

diff --git a/src/game.cpp b/src/game.cpp
index 824eb7d1..5b78bdb5 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -42,7 +42,6 @@
 #include "sound.h"
 
 #include "gui/chatwindow.h"
-#include "gui/confirmdialog.h"
 #include "gui/debugwindow.h"
 #include "gui/equipmentwindow.h"
 #include "gui/gui.h"
@@ -72,7 +71,6 @@
 #include "gui/widgets/layout.h"
 
 #include "net/gamehandler.h"
-#include "net/generalhandler.h"
 #include "net/net.h"
 #include "net/playerhandler.h"
 
@@ -403,10 +401,10 @@ void Game::handleInput()
     {
         bool used = false;
 
-        if (event.type == SDL_VIDEORESIZE)
+        if (event.type == SDL_WINDOWEVENT && event.window.event == SDL_WINDOWEVENT_RESIZED)
         {
             // Let the client deal with this one (it'll pass down from there)
-            Client::instance()->handleVideoResize(event.resize.w, event.resize.h);
+            Client::instance()->handleVideoResize(event.window.data1, event.window.data2);
         }
         // Keyboard events (for discontinuous keys)
         else if (event.type == SDL_KEYDOWN)