diff options
38 files changed, 5 insertions, 103 deletions
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp index 229303da2..24c4302f2 100644 --- a/src/gui/equipmentwindow.cpp +++ b/src/gui/equipmentwindow.cpp @@ -49,6 +49,8 @@ #include <guichan/font.hpp> +#include <SDL_mouse.h> + #include "debug.h" static const int BOX_COUNT = 13; diff --git a/src/resources/animation.cpp b/src/resources/animation.cpp index 972dc15a2..76e8543e0 100644 --- a/src/resources/animation.cpp +++ b/src/resources/animation.cpp @@ -22,10 +22,6 @@ #include "resources/animation.h" -#include "logger.h" - -#include "utils/dtor.h" - #include "debug.h" Animation::Animation() : diff --git a/src/resources/atlasmanager.cpp b/src/resources/atlasmanager.cpp index b60ee0a50..78e3d5190 100644 --- a/src/resources/atlasmanager.cpp +++ b/src/resources/atlasmanager.cpp @@ -24,10 +24,6 @@ #include "resources/atlasmanager.h" -#include "client.h" -#include "graphicsmanager.h" -#include "logger.h" - #include "render/surfacegraphics.h" #include "utils/mathutils.h" @@ -36,9 +32,7 @@ #include "utils/sdlcheckutils.h" #include "resources/dye.h" -#include "resources/fboinfo.h" #include "resources/imagehelper.h" -#include "resources/imagewriter.h" #include "resources/openglimagehelper.h" #include "resources/resourcemanager.h" diff --git a/src/resources/avatardb.cpp b/src/resources/avatardb.cpp index d610a14dc..2275f3576 100644 --- a/src/resources/avatardb.cpp +++ b/src/resources/avatardb.cpp @@ -24,8 +24,6 @@ #include "logger.h" -#include "net/net.h" - #include "resources/beinginfo.h" #include "utils/dtor.h" diff --git a/src/resources/beingcommon.cpp b/src/resources/beingcommon.cpp index 66c5586ee..0ad8d563e 100644 --- a/src/resources/beingcommon.cpp +++ b/src/resources/beingcommon.cpp @@ -20,13 +20,10 @@ #include "resources/beingcommon.h" -#include "logger.h" - #include "resources/beinginfo.h" #include "debug.h" - void BeingCommon::readBasicAttributes(BeingInfo *const info, XmlNodePtr node, const std::string &hoverCursor) { diff --git a/src/resources/beingcommon.h b/src/resources/beingcommon.h index a8d3a5b8f..0a1850217 100644 --- a/src/resources/beingcommon.h +++ b/src/resources/beingcommon.h @@ -21,8 +21,6 @@ #ifndef RESOURCES_BEINGCOMMON_H #define RESOURCES_BEINGCOMMON_H -#include <stdint.h> - #include "utils/xml.h" #include "localconsts.h" diff --git a/src/resources/beinginfo.h b/src/resources/beinginfo.h index a475a573a..7437e464d 100644 --- a/src/resources/beinginfo.h +++ b/src/resources/beinginfo.h @@ -29,7 +29,6 @@ #include "resources/cursor.h" #include "resources/soundinfo.h" -#include <list> #include <map> struct Attack final diff --git a/src/resources/chardb.cpp b/src/resources/chardb.cpp index 73582e989..280ed6787 100644 --- a/src/resources/chardb.cpp +++ b/src/resources/chardb.cpp @@ -21,7 +21,6 @@ #include "resources/chardb.h" -#include "client.h" #include "configuration.h" #include "logger.h" diff --git a/src/resources/chardb.h b/src/resources/chardb.h index b61d61e1d..3072d41ff 100644 --- a/src/resources/chardb.h +++ b/src/resources/chardb.h @@ -22,9 +22,6 @@ #ifndef RESOURCES_CHARDB_H #define RESOURCES_CHARDB_H -#include <map> -#include <string> - #include "utils/xml.h" #include <vector> diff --git a/src/resources/deaddb.h b/src/resources/deaddb.h index eb39e864a..a0f6c7b9b 100644 --- a/src/resources/deaddb.h +++ b/src/resources/deaddb.h @@ -21,13 +21,8 @@ #ifndef RESOURCES_DEADDB_H #define RESOURCES_DEADDB_H -#include <map> #include <string> -#include "utils/xml.h" - -#include <vector> - /** * Char information database. */ diff --git a/src/resources/image.cpp b/src/resources/image.cpp index 4cb9d7f1d..ac23a7c13 100644 --- a/src/resources/image.cpp +++ b/src/resources/image.cpp @@ -22,16 +22,8 @@ #include "resources/image.h" -#include "resources/dye.h" #include "resources/resourcemanager.h" -#ifdef USE_OPENGL -#include "render/mobileopenglgraphics.h" -#include "render/normalopenglgraphics.h" -#include "render/safeopenglgraphics.h" -#endif - -#include "client.h" #include "logger.h" #include "resources/imagehelper.h" @@ -41,7 +33,6 @@ #include "utils/sdlcheckutils.h" -#include <SDL_image.h> #include <SDL_rotozoom.h> #include "debug.h" diff --git a/src/resources/image.h b/src/resources/image.h index 664642e3a..1f8e2b4b6 100644 --- a/src/resources/image.h +++ b/src/resources/image.h @@ -28,7 +28,7 @@ #include "resources/resource.h" -#include <SDL.h> +#include <SDL_video.h> #ifdef USE_OPENGL @@ -44,10 +44,6 @@ #include <map> -class Dye; - -struct Position; - /** * Defines a class for loading and storing images. */ diff --git a/src/resources/imagehelper.cpp b/src/resources/imagehelper.cpp index 2eb374bd4..dbbe21769 100644 --- a/src/resources/imagehelper.cpp +++ b/src/resources/imagehelper.cpp @@ -22,15 +22,9 @@ #include "resources/imagehelper.h" -#include "resources/dye.h" -#include "resources/resourcemanager.h" - -#include "client.h" #include "logger.h" #include "main.h" -#include "resources/image.h" - #include "utils/sdlcheckutils.h" #include <SDL_image.h> diff --git a/src/resources/imagehelper.h b/src/resources/imagehelper.h index ed8f89323..b09d21d4a 100644 --- a/src/resources/imagehelper.h +++ b/src/resources/imagehelper.h @@ -29,13 +29,11 @@ #include "resources/resource.h" -#include <SDL.h> +#include <SDL_video.h> class Dye; class Image; -struct Position; - /** * Defines a class for loading and storing images. */ diff --git a/src/resources/imagewriter.cpp b/src/resources/imagewriter.cpp index ef0b48dc2..9bdde319b 100644 --- a/src/resources/imagewriter.cpp +++ b/src/resources/imagewriter.cpp @@ -25,7 +25,7 @@ #include "logger.h" #include <png.h> -#include <SDL.h> +#include <SDL_video.h> #include <string> #include "debug.h" diff --git a/src/resources/imagewriter.h b/src/resources/imagewriter.h index c71f61ca3..b68ee81c2 100644 --- a/src/resources/imagewriter.h +++ b/src/resources/imagewriter.h @@ -23,8 +23,6 @@ #ifndef RESOURCES_IMAGEWRITER_H #define RESOURCES_IMAGEWRITER_H -#include <iosfwd> - #include <string> #include "localconsts.h" diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp index 73a1cf637..513ec6488 100644 --- a/src/resources/itemdb.cpp +++ b/src/resources/itemdb.cpp @@ -27,7 +27,6 @@ #include "logger.h" #include "resources/iteminfo.h" -#include "resources/resourcemanager.h" #include "utils/dtor.h" #include "utils/gettext.h" diff --git a/src/resources/itemdb.h b/src/resources/itemdb.h index 6e23c7017..1a5a4cce8 100644 --- a/src/resources/itemdb.h +++ b/src/resources/itemdb.h @@ -25,7 +25,6 @@ #include "utils/stringvector.h" -#include <list> #include <map> #include "localconsts.h" diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp index d788613bf..b4d1d5a69 100644 --- a/src/resources/iteminfo.cpp +++ b/src/resources/iteminfo.cpp @@ -28,7 +28,6 @@ #include "utils/dtor.h" -#include <set> #include <map> #include "debug.h" diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h index d0b305c49..7e2dd1bff 100644 --- a/src/resources/iteminfo.h +++ b/src/resources/iteminfo.h @@ -28,7 +28,6 @@ #include "resources/colordb.h" #include <map> -#include <set> enum EquipmentSlot { diff --git a/src/resources/mapdb.cpp b/src/resources/mapdb.cpp index 9dbf17949..61ebe6d17 100644 --- a/src/resources/mapdb.cpp +++ b/src/resources/mapdb.cpp @@ -22,7 +22,6 @@ #include "resources/mapdb.h" #include "configuration.h" -#include "client.h" #include "logger.h" #include "debug.h" diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index 59b90b396..327f356ac 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -22,7 +22,6 @@ #include "resources/mapreader.h" -#include "client.h" #include "configuration.h" #include "graphicsmanager.h" #include "logger.h" @@ -37,7 +36,6 @@ #include "resources/resourcemanager.h" #include "utils/base64.h" -#include "utils/gettext.h" #include <iostream> #include <zlib.h> diff --git a/src/resources/mapreader.h b/src/resources/mapreader.h index 0dbc299d2..7ac70a99f 100644 --- a/src/resources/mapreader.h +++ b/src/resources/mapreader.h @@ -30,7 +30,6 @@ class Map; class MapLayer; class Properties; -class Resource; class Tileset; /** diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp index ff7bed370..e900c426f 100644 --- a/src/resources/monsterdb.cpp +++ b/src/resources/monsterdb.cpp @@ -24,8 +24,6 @@ #include "logger.h" -#include "net/net.h" - #include "resources/beingcommon.h" #include "resources/beinginfo.h" diff --git a/src/resources/openglimagehelper.cpp b/src/resources/openglimagehelper.cpp index 2216659a3..ba9931f55 100644 --- a/src/resources/openglimagehelper.cpp +++ b/src/resources/openglimagehelper.cpp @@ -24,8 +24,6 @@ #ifdef USE_OPENGL -#include "client.h" -#include "game.h" #include "graphicsmanager.h" #include "logger.h" #include "mgl.h" @@ -37,10 +35,8 @@ #include "resources/dye.h" #include "resources/image.h" -#include "resources/resourcemanager.h" #include "utils/sdlcheckutils.h" -#include "utils/stringutils.h" #include <SDL_image.h> diff --git a/src/resources/openglimagehelper.h b/src/resources/openglimagehelper.h index b8437e1aa..027a1e835 100644 --- a/src/resources/openglimagehelper.h +++ b/src/resources/openglimagehelper.h @@ -33,12 +33,8 @@ #define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8 #endif -#include "utils/stringvector.h" - #include "resources/imagehelper.h" -#include <SDL.h> - #ifdef ANDROID #include <GLES/gl.h> #define GL_RGBA8 GL_RGBA8_OES diff --git a/src/resources/petdb.h b/src/resources/petdb.h index 4c43f1869..d5e4b5613 100644 --- a/src/resources/petdb.h +++ b/src/resources/petdb.h @@ -23,8 +23,6 @@ #ifndef RESOURCES_PETDB_H #define RESOURCES_PETDB_H -#include <stdint.h> - #include "localconsts.h" class BeingInfo; diff --git a/src/resources/resource.cpp b/src/resources/resource.cpp index b12e2f511..0ec09e0f0 100644 --- a/src/resources/resource.cpp +++ b/src/resources/resource.cpp @@ -22,7 +22,6 @@ #include "resources/resource.h" -#include "client.h" #include "logger.h" #include "resources/resourcemanager.h" diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp index bd422ca0e..c4431b781 100644 --- a/src/resources/resourcemanager.cpp +++ b/src/resources/resourcemanager.cpp @@ -26,7 +26,6 @@ #include "client.h" #include "configuration.h" #include "logger.h" -#include "map.h" #include "navigationmanager.h" #include "walklayer.h" @@ -36,7 +35,6 @@ #include "resources/imagehelper.h" #include "resources/imageset.h" #include "resources/sdlmusic.h" -#include "resources/openglimagehelper.h" #include "resources/soundeffect.h" #include "resources/spritedef.h" @@ -46,14 +44,9 @@ #include "utils/sdlcheckutils.h" #include <SDL_image.h> -#include <cassert> #include <dirent.h> #include <fstream> -#include <iostream> -#include <sstream> -#include <zlib.h> -#include <sys/stat.h> #include <sys/time.h> #include "debug.h" diff --git a/src/resources/sdlimagehelper.cpp b/src/resources/sdlimagehelper.cpp index ad146aa22..84f36ec79 100644 --- a/src/resources/sdlimagehelper.cpp +++ b/src/resources/sdlimagehelper.cpp @@ -25,9 +25,7 @@ #include "resources/sdlimagehelper.h" #include "resources/dye.h" -#include "resources/resourcemanager.h" -#include "client.h" #include "logger.h" #include "main.h" diff --git a/src/resources/sdlimagehelper.h b/src/resources/sdlimagehelper.h index 5c3cabb09..995f5adcc 100644 --- a/src/resources/sdlimagehelper.h +++ b/src/resources/sdlimagehelper.h @@ -32,8 +32,6 @@ #include "resources/imagehelper.h" -#include <SDL.h> - class Dye; class Image; diff --git a/src/resources/sounddb.cpp b/src/resources/sounddb.cpp index 6dcf20b17..71e1a01e4 100644 --- a/src/resources/sounddb.cpp +++ b/src/resources/sounddb.cpp @@ -20,9 +20,7 @@ #include "resources/sounddb.h" -#include "client.h" #include "configuration.h" -#include "logger.h" #include "notifications.h" #include "notifymanager.h" diff --git a/src/resources/sounddb.h b/src/resources/sounddb.h index 864d23fb9..356cd4e13 100644 --- a/src/resources/sounddb.h +++ b/src/resources/sounddb.h @@ -21,7 +21,6 @@ #ifndef RESOURCES_SOUNDDB_H #define RESOURCES_SOUNDDB_H -#include <map> #include <string> #include "localconsts.h" diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp index 16d120b0f..78c456878 100644 --- a/src/resources/spritedef.cpp +++ b/src/resources/spritedef.cpp @@ -27,7 +27,6 @@ #include "resources/action.h" #include "resources/animation.h" #include "resources/dye.h" -#include "resources/image.h" #include "resources/imageset.h" #include "resources/resourcemanager.h" diff --git a/src/resources/subimage.cpp b/src/resources/subimage.cpp index f9e8aea83..ee13777b1 100644 --- a/src/resources/subimage.cpp +++ b/src/resources/subimage.cpp @@ -22,18 +22,10 @@ #include "resources/subimage.h" -#ifdef USE_OPENGL -#include "render/mobileopenglgraphics.h" -#include "render/normalopenglgraphics.h" -#include "render/safeopenglgraphics.h" -#endif - #ifdef DEBUG_IMAGES #include "logger.h" #endif -#include "client.h" - #include "debug.h" #ifdef USE_SDL2 diff --git a/src/resources/subimage.h b/src/resources/subimage.h index d61d47eb4..234015893 100644 --- a/src/resources/subimage.h +++ b/src/resources/subimage.h @@ -26,8 +26,6 @@ #include "localconsts.h" #include "main.h" -#include <SDL.h> - #ifdef USE_OPENGL #ifdef ANDROID diff --git a/src/resources/wallpaper.cpp b/src/resources/wallpaper.cpp index 3530d0e96..0bbbbfa2a 100644 --- a/src/resources/wallpaper.cpp +++ b/src/resources/wallpaper.cpp @@ -23,7 +23,6 @@ #include "resources/wallpaper.h" #include "configuration.h" -#include "logger.h" #include "resources/resourcemanager.h" @@ -32,7 +31,6 @@ #include <algorithm> #include <cstring> #include <time.h> -#include <iostream> #include "debug.h" diff --git a/src/touchactions.h b/src/touchactions.h index 4d9a8a60c..f61c5496e 100644 --- a/src/touchactions.h +++ b/src/touchactions.h @@ -21,8 +21,6 @@ #ifndef TOUCHACTIONS_H #define TOUCHACTIONS_H -#include <guichan/mouseinput.hpp> - #include "localconsts.h" #define decHandler(name) void name(const MouseInput &mouseInput) |