summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/db/colordb.cpp3
-rw-r--r--src/resources/db/itemdb.cpp3
-rw-r--r--src/resources/sdl2imagehelper.cpp1
-rw-r--r--src/resources/sdl2softwareimagehelper.cpp1
-rw-r--r--src/resources/surfaceimagehelper.cpp1
5 files changed, 4 insertions, 5 deletions
diff --git a/src/resources/db/colordb.cpp b/src/resources/db/colordb.cpp
index 0e81ff1c0..8f4e1431c 100644
--- a/src/resources/db/colordb.cpp
+++ b/src/resources/db/colordb.cpp
@@ -21,7 +21,6 @@
#include "resources/db/colordb.h"
-#include "client.h"
#include "configuration.h"
#include "logger.h"
@@ -37,6 +36,8 @@ namespace
ColorDB::ColorLists mColorLists;
}
+extern int serverVersion;
+
void ColorDB::load()
{
if (mLoaded)
diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp
index cc8c0338b..f7b1f6349 100644
--- a/src/resources/db/itemdb.cpp
+++ b/src/resources/db/itemdb.cpp
@@ -22,7 +22,6 @@
#include "resources/db/itemdb.h"
-#include "client.h"
#include "configuration.h"
#include "logger.h"
@@ -45,6 +44,8 @@ namespace
std::map<std::string, ItemSoundEvent> mSoundNames;
} // namespace
+extern int serverVersion;
+
// Forward declarations
static void loadSpriteRef(ItemInfo *const itemInfo, const XmlNodePtr node);
static void loadSoundRef(ItemInfo *const itemInfo, const XmlNodePtr node);
diff --git a/src/resources/sdl2imagehelper.cpp b/src/resources/sdl2imagehelper.cpp
index 2ee72b0ee..c3481a1b5 100644
--- a/src/resources/sdl2imagehelper.cpp
+++ b/src/resources/sdl2imagehelper.cpp
@@ -27,7 +27,6 @@
#include "resources/dye.h"
#include "resources/resourcemanager.h"
-#include "client.h"
#include "logger.h"
#include "main.h"
diff --git a/src/resources/sdl2softwareimagehelper.cpp b/src/resources/sdl2softwareimagehelper.cpp
index db41a4ddc..2886c3ff6 100644
--- a/src/resources/sdl2softwareimagehelper.cpp
+++ b/src/resources/sdl2softwareimagehelper.cpp
@@ -27,7 +27,6 @@
#include "resources/dye.h"
#include "resources/resourcemanager.h"
-#include "client.h"
#include "logger.h"
#include "main.h"
diff --git a/src/resources/surfaceimagehelper.cpp b/src/resources/surfaceimagehelper.cpp
index b249dfea9..22aa904f5 100644
--- a/src/resources/surfaceimagehelper.cpp
+++ b/src/resources/surfaceimagehelper.cpp
@@ -27,7 +27,6 @@
#include "resources/dye.h"
#include "resources/resourcemanager.h"
-#include "client.h"
#include "logger.h"
#include "main.h"