summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/animation.h1
-rw-r--r--src/resources/beinginfo.h2
-rw-r--r--src/resources/beingmenuitem.h4
-rw-r--r--src/resources/chatobject.h2
-rw-r--r--src/resources/db/mapdb.h2
-rw-r--r--src/resources/db/moddb.h2
-rw-r--r--src/resources/dyecolor.h2
-rw-r--r--src/resources/fboinfo.h1
-rw-r--r--src/resources/image.h1
-rw-r--r--src/resources/imagehelper.h2
-rw-r--r--src/resources/iteminfo.h2
-rw-r--r--src/resources/itemtypemapdata.h2
-rw-r--r--src/resources/map/map.h1
-rw-r--r--src/resources/map/maplayer.cpp1
-rw-r--r--src/resources/map/maplayer.h3
-rw-r--r--src/resources/map/maprowvertexes.h2
-rw-r--r--src/resources/map/properties.h1
-rw-r--r--src/resources/mapreader.h2
-rw-r--r--src/resources/modinfo.h2
-rw-r--r--src/resources/notifications.h2
-rw-r--r--src/resources/questitem.h1
-rw-r--r--src/resources/resource.h3
-rw-r--r--src/resources/resourcemanager.h3
-rw-r--r--src/resources/subimage.h1
-rw-r--r--src/resources/wallpaper.cpp4
25 files changed, 8 insertions, 41 deletions
diff --git a/src/resources/animation.h b/src/resources/animation.h
index 3a737a0c8..763818e4b 100644
--- a/src/resources/animation.h
+++ b/src/resources/animation.h
@@ -26,7 +26,6 @@
#include "resources/frame.h"
#include <vector>
-#include <string>
#include "localconsts.h"
diff --git a/src/resources/beinginfo.h b/src/resources/beinginfo.h
index c0d00e1c6..43c711524 100644
--- a/src/resources/beinginfo.h
+++ b/src/resources/beinginfo.h
@@ -32,8 +32,6 @@
#include "resources/map/blocktype.h"
-#include <map>
-
struct Attack;
namespace ColorDB
diff --git a/src/resources/beingmenuitem.h b/src/resources/beingmenuitem.h
index 78f4a6d84..7f0b43f01 100644
--- a/src/resources/beingmenuitem.h
+++ b/src/resources/beingmenuitem.h
@@ -21,10 +21,10 @@
#ifndef RESOURCES_BEINGMENUITEM_H
#define RESOURCES_BEINGMENUITEM_H
-#include "resources/image.h"
-
#include <string>
+#include "localconsts.h"
+
struct BeingMenuItem final
{
BeingMenuItem(const std::string &name0, const std::string &command0) :
diff --git a/src/resources/chatobject.h b/src/resources/chatobject.h
index 6095f37eb..b3945ec5f 100644
--- a/src/resources/chatobject.h
+++ b/src/resources/chatobject.h
@@ -23,8 +23,6 @@
#include "resources/image.h"
-#include <string>
-
struct ChatObject final
{
ChatObject() :
diff --git a/src/resources/db/mapdb.h b/src/resources/db/mapdb.h
index 120fcf289..e44c3e651 100644
--- a/src/resources/db/mapdb.h
+++ b/src/resources/db/mapdb.h
@@ -22,8 +22,6 @@
#ifndef RESOURCES_DB_MAPDB_H
#define RESOURCES_DB_MAPDB_H
-#include "utils/stringvector.h"
-
#include "resources/mapinfo.h"
#include <map>
diff --git a/src/resources/db/moddb.h b/src/resources/db/moddb.h
index 0333f9fd5..3af47255d 100644
--- a/src/resources/db/moddb.h
+++ b/src/resources/db/moddb.h
@@ -25,8 +25,6 @@
#include "resources/modinfo.h"
-#include <string>
-
#include "localconsts.h"
class ModInfo;
diff --git a/src/resources/dyecolor.h b/src/resources/dyecolor.h
index 90571b5fb..2a3b32968 100644
--- a/src/resources/dyecolor.h
+++ b/src/resources/dyecolor.h
@@ -21,8 +21,6 @@
#ifndef RESOURCES_DYECOLOR_H
#define RESOURCES_DYECOLOR_H
-#include <SDL_stdinc.h>
-
#include "localconsts.h"
struct DyeColor final
diff --git a/src/resources/fboinfo.h b/src/resources/fboinfo.h
index 28b26b7b5..0898666e5 100644
--- a/src/resources/fboinfo.h
+++ b/src/resources/fboinfo.h
@@ -21,7 +21,6 @@
#ifndef RESOURCES_FBOINFO_H
#define RESOURCES_FBOINFO_H
-#include "main.h"
#ifdef USE_OPENGL
#include "render/graphics.h"
diff --git a/src/resources/image.h b/src/resources/image.h
index 568999b33..0484f52b7 100644
--- a/src/resources/image.h
+++ b/src/resources/image.h
@@ -24,7 +24,6 @@
#define RESOURCES_IMAGE_H
#include "localconsts.h"
-#include "main.h"
#include "resources/resource.h"
diff --git a/src/resources/imagehelper.h b/src/resources/imagehelper.h
index afbfc25b4..5c33e8207 100644
--- a/src/resources/imagehelper.h
+++ b/src/resources/imagehelper.h
@@ -27,8 +27,6 @@
#include "enums/render/rendertype.h"
-#include "resources/resource.h"
-
#include <SDL_video.h>
class Dye;
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index 4d69b5c36..55e35ea22 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -30,8 +30,6 @@
#include "resources/soundinfo.h"
#include "resources/spritedisplay.h"
-#include <map>
-
namespace ColorDB
{
class ItemColor;
diff --git a/src/resources/itemtypemapdata.h b/src/resources/itemtypemapdata.h
index 77dd8c9aa..952329a24 100644
--- a/src/resources/itemtypemapdata.h
+++ b/src/resources/itemtypemapdata.h
@@ -25,8 +25,6 @@
#include "resources/itemtypemap.h"
-#include <string>
-
#include "localconsts.h"
ItemTypeMap itemTypeMap[] =
diff --git a/src/resources/map/map.h b/src/resources/map/map.h
index a6bc81560..ade7de0be 100644
--- a/src/resources/map/map.h
+++ b/src/resources/map/map.h
@@ -36,7 +36,6 @@
#include "listeners/configlistener.h"
-#include <string>
#include <vector>
class AmbientLayer;
diff --git a/src/resources/map/maplayer.cpp b/src/resources/map/maplayer.cpp
index 2c0f050b5..5f3c29586 100644
--- a/src/resources/map/maplayer.cpp
+++ b/src/resources/map/maplayer.cpp
@@ -32,6 +32,7 @@
#include "render/graphics.h"
+#include "resources/image.h"
#include "resources/mapitemtype.h"
#include "resources/map/mapitem.h"
diff --git a/src/resources/map/maplayer.h b/src/resources/map/maplayer.h
index a5d789d11..4f06cddef 100644
--- a/src/resources/map/maplayer.h
+++ b/src/resources/map/maplayer.h
@@ -23,13 +23,10 @@
#ifndef RESOURCES_MAP_MAPLAYER_H
#define RESOURCES_MAP_MAPLAYER_H
-#include "main.h"
-
#include "listeners/configlistener.h"
#include "being/actor.h"
-#include <string>
#include <vector>
class Image;
diff --git a/src/resources/map/maprowvertexes.h b/src/resources/map/maprowvertexes.h
index ffd00b33f..e586f5530 100644
--- a/src/resources/map/maprowvertexes.h
+++ b/src/resources/map/maprowvertexes.h
@@ -25,8 +25,6 @@
#include "graphicsvertexes.h"
-#include <vector>
-
#include "localconsts.h"
typedef std::vector<ImageVertexes*> MapRowImages;
diff --git a/src/resources/map/properties.h b/src/resources/map/properties.h
index e4a9ff3b9..d09a27aa3 100644
--- a/src/resources/map/properties.h
+++ b/src/resources/map/properties.h
@@ -27,7 +27,6 @@
#include <map>
#include <sstream>
-#include <string>
/**
* A class holding a set of properties.
diff --git a/src/resources/mapreader.h b/src/resources/mapreader.h
index d0e39ece4..c427a75b3 100644
--- a/src/resources/mapreader.h
+++ b/src/resources/mapreader.h
@@ -27,8 +27,6 @@
#include "resources/map/maplayer.h"
-#include <string>
-
class Map;
class MapHeights;
class MapLayer;
diff --git a/src/resources/modinfo.h b/src/resources/modinfo.h
index de13e6885..496489d28 100644
--- a/src/resources/modinfo.h
+++ b/src/resources/modinfo.h
@@ -21,8 +21,8 @@
#ifndef RESOURCES_MODINFO_H
#define RESOURCES_MODINFO_H
-#include <string>
#include <map>
+#include <string>
#include "localconsts.h"
diff --git a/src/resources/notifications.h b/src/resources/notifications.h
index 428b0da0c..78b19b7e9 100644
--- a/src/resources/notifications.h
+++ b/src/resources/notifications.h
@@ -23,8 +23,6 @@
#include "localconsts.h"
-#include "enums/resources/notifyflags.h"
-
#include "resources/notificationinfo.h"
#include "utils/gettext.h"
diff --git a/src/resources/questitem.h b/src/resources/questitem.h
index af32ec06d..49186c29a 100644
--- a/src/resources/questitem.h
+++ b/src/resources/questitem.h
@@ -24,7 +24,6 @@
#include "resources/questitemtext.h"
#include <set>
-#include <string>
#include <vector>
#include "localconsts.h"
diff --git a/src/resources/resource.h b/src/resources/resource.h
index 01bd4f276..21117b5ef 100644
--- a/src/resources/resource.h
+++ b/src/resources/resource.h
@@ -23,9 +23,6 @@
#ifndef RESOURCES_RESOURCE_H
#define RESOURCES_RESOURCE_H
-#include "main.h"
-
-#include <ctime>
#include <string>
#include "localconsts.h"
diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h
index 39fc47761..c98d7957f 100644
--- a/src/resources/resourcemanager.h
+++ b/src/resources/resourcemanager.h
@@ -23,11 +23,8 @@
#ifndef RESOURCES_RESOURCEMANAGER_H
#define RESOURCES_RESOURCEMANAGER_H
-#include "main.h"
-
#include "utils/stringvector.h"
-#include <ctime>
#include <map>
#include <set>
diff --git a/src/resources/subimage.h b/src/resources/subimage.h
index 3282e1d1a..7edd546ee 100644
--- a/src/resources/subimage.h
+++ b/src/resources/subimage.h
@@ -24,7 +24,6 @@
#define RESOURCES_SUBIMAGE_H
#include "localconsts.h"
-#include "main.h"
#ifdef USE_OPENGL
diff --git a/src/resources/wallpaper.cpp b/src/resources/wallpaper.cpp
index dc251f013..8dbccf8cc 100644
--- a/src/resources/wallpaper.cpp
+++ b/src/resources/wallpaper.cpp
@@ -30,6 +30,10 @@
#include <algorithm>
+#ifdef WIN32
+#include <sys/time.h>
+#endif
+
#include "debug.h"
static bool wallpaperCompare(const WallpaperData &a, const WallpaperData &b);
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-09 09:49:52 +0000