summaryrefslogtreecommitdiff
path: root/src/resources/resourcemanager
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-05-29 14:55:40 +0300
committerAndrei Karas <akaras@inbox.ru>2016-05-29 14:55:40 +0300
commit4c6264db7ad4f0ae8a6c001903b47741abb94d8c (patch)
treea4e95239130dc4b86d036acd10c95f5fe3b96999 /src/resources/resourcemanager
parentf6e76f469a81ff2d9e3714d39d1a8f4012cda2b8 (diff)
downloadmanaplus-4c6264db7ad4f0ae8a6c001903b47741abb94d8c.tar.gz
manaplus-4c6264db7ad4f0ae8a6c001903b47741abb94d8c.tar.bz2
manaplus-4c6264db7ad4f0ae8a6c001903b47741abb94d8c.tar.xz
manaplus-4c6264db7ad4f0ae8a6c001903b47741abb94d8c.zip
Fix code style.
Diffstat (limited to 'src/resources/resourcemanager')
-rw-r--r--src/resources/resourcemanager/resourcemanager.cpp16
-rw-r--r--src/resources/resourcemanager/resourcemanager.h9
2 files changed, 2 insertions, 23 deletions
diff --git a/src/resources/resourcemanager/resourcemanager.cpp b/src/resources/resourcemanager/resourcemanager.cpp
index b2d4d483d..d61ec9342 100644
--- a/src/resources/resourcemanager/resourcemanager.cpp
+++ b/src/resources/resourcemanager/resourcemanager.cpp
@@ -24,31 +24,19 @@
#include "configuration.h"
#include "logger.h"
-#include "navigationmanager.h"
-
-#include "resources/map/walklayer.h"
#ifdef USE_OPENGL
-#include "resources/atlas/atlasmanager.h"
-#include "resources/atlas/atlasresource.h"
-#else // USE_OPENGL
#include "resources/image.h"
-#endif // USE_OPENGL
-#include "resources/imagehelper.h"
#include "resources/imageset.h"
+#endif // USE_OPENGL
#include "resources/memorymanager.h"
-#include "resources/dye/dye.h"
-
-#include "resources/loaders/imageloader.h"
-
#include "resources/sprite/spritedef.h"
#include "utils/checkutils.h"
#include "utils/delete2.h"
-#include "utils/physfscheckutils.h"
#include "utils/physfsrwops.h"
-#include "utils/sdlcheckutils.h"
+#include "utils/physfstools.h"
#ifdef USE_OPENGL
#include "render/shaders/shader.h"
diff --git a/src/resources/resourcemanager/resourcemanager.h b/src/resources/resourcemanager/resourcemanager.h
index caad4bb6e..0a7629257 100644
--- a/src/resources/resourcemanager/resourcemanager.h
+++ b/src/resources/resourcemanager/resourcemanager.h
@@ -27,21 +27,12 @@
#include "enums/simpletypes/append.h"
-#include "utils/stringvector.h"
-
#include <map>
#include <set>
#include "localconsts.h"
-class Image;
-class ImageSet;
-class Map;
-class SDLMusic;
class Resource;
-class SoundEffect;
-class SpriteDef;
-class WalkLayer;
struct SDL_Surface;
struct SDL_RWops;