From 2c51c98625b225cecfb9628c30d62d4e30f7e3e1 Mon Sep 17 00:00:00 2001
From: Thorbjørn Lindeijer <bjorn@lindeijer.nl>
Date: Thu, 25 Jan 2024 15:41:57 +0100
Subject: Ported to SDL2

---
 src/game.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/game.cpp')

diff --git a/src/game.cpp b/src/game.cpp
index 222e56df..f71d8575 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -398,10 +398,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)
-- 
cgit v1.2.3-70-g09d2


From 5307b022f652ad34a8b2ef35d674817b7da33759 Mon Sep 17 00:00:00 2001
From: Thorbjørn Lindeijer <bjorn@lindeijer.nl>
Date: Thu, 25 Jan 2024 15:44:38 +0100
Subject: Minor includes cleanup

---
 src/client.cpp                | 5 -----
 src/game.cpp                  | 2 --
 src/gui/setup_video.cpp       | 3 ---
 src/gui/socialwindow.cpp      | 3 ---
 src/gui/widgets/textfield.cpp | 1 -
 src/sound.cpp                 | 1 -
 6 files changed, 15 deletions(-)

(limited to 'src/game.cpp')

diff --git a/src/client.cpp b/src/client.cpp
index 4030b042..ffea7a8a 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -34,7 +34,6 @@
 #endif
 #include "playerrelations.h"
 #include "sound.h"
-#include "statuseffect.h"
 #include "units.h"
 
 #include "gui/changeemaildialog.h"
@@ -66,12 +65,8 @@
 
 #include "resources/chardb.h"
 #include "resources/hairdb.h"
-#include "resources/emotedb.h"
 #include "resources/image.h"
 #include "resources/itemdb.h"
-#include "resources/monsterdb.h"
-#include "resources/specialdb.h"
-#include "resources/npcdb.h"
 #include "resources/resourcemanager.h"
 #include "resources/theme.h"
 #include "resources/userpalette.h"
diff --git a/src/game.cpp b/src/game.cpp
index f71d8575..c934ed69 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"
@@ -70,7 +69,6 @@
 #include "gui/widgets/itemshortcutcontainer.h"
 
 #include "net/gamehandler.h"
-#include "net/generalhandler.h"
 #include "net/net.h"
 #include "net/playerhandler.h"
 
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index c9d1dbc9..709a7685 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -26,7 +26,6 @@
 #include "game.h"
 #include "graphics.h"
 #include "localplayer.h"
-#include "main.h"
 #include "particle.h"
 
 #include "gui/okdialog.h"
@@ -38,8 +37,6 @@
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/slider.h"
 #include "gui/widgets/spacer.h"
-#include "gui/widgets/textfield.h"
-#include "gui/widgets/dropdown.h"
 
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp
index 1b960d64..7e074470 100644
--- a/src/gui/socialwindow.cpp
+++ b/src/gui/socialwindow.cpp
@@ -33,8 +33,6 @@
 #include "gui/widgets/avatarlistbox.h"
 #include "gui/widgets/browserbox.h"
 #include "gui/widgets/button.h"
-#include "gui/widgets/container.h"
-#include "gui/widgets/label.h"
 #include "gui/widgets/linkhandler.h"
 #include "gui/widgets/popup.h"
 #include "gui/widgets/scrollarea.h"
@@ -47,7 +45,6 @@
 
 #include "resources/theme.h"
 
-#include "utils/dtor.h"
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp
index c4c00ae4..35ce09c5 100644
--- a/src/gui/widgets/textfield.cpp
+++ b/src/gui/widgets/textfield.cpp
@@ -24,7 +24,6 @@
 #include "configuration.h"
 #include "graphics.h"
 
-#include "gui/palette.h"
 #include "gui/sdlinput.h"
 
 #include "resources/image.h"
diff --git a/src/sound.cpp b/src/sound.cpp
index 2fc4f87f..44f55cba 100644
--- a/src/sound.cpp
+++ b/src/sound.cpp
@@ -22,7 +22,6 @@
 #include <SDL.h>
 
 #include "configuration.h"
-#include "game.h"
 #include "localplayer.h"
 #include "log.h"
 #include "sound.h"
-- 
cgit v1.2.3-70-g09d2