summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-05-30 21:03:20 +0300
committerAndrei Karas <akaras@inbox.ru>2014-05-31 12:16:43 +0300
commitc0197404a15a3937ef3cd21f48a09e691a96518f (patch)
tree582b01cfc1c716b19122fe28f57abefb3bf5b716 /src/resources
parent9bb11133522836a9c5e251550ac88c9a4e091c0e (diff)
downloadmanaverse-c0197404a15a3937ef3cd21f48a09e691a96518f.tar.gz
manaverse-c0197404a15a3937ef3cd21f48a09e691a96518f.tar.bz2
manaverse-c0197404a15a3937ef3cd21f48a09e691a96518f.tar.xz
manaverse-c0197404a15a3937ef3cd21f48a09e691a96518f.zip
fix code style.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/db/palettedb.cpp1
-rw-r--r--src/resources/map/map.cpp1
-rw-r--r--src/resources/resourcemanager.cpp4
-rw-r--r--src/resources/resourcemanager.h2
-rw-r--r--src/resources/wallpaper.cpp1
5 files changed, 0 insertions, 9 deletions
diff --git a/src/resources/db/palettedb.cpp b/src/resources/db/palettedb.cpp
index 1d940f0c1..8ec238336 100644
--- a/src/resources/db/palettedb.cpp
+++ b/src/resources/db/palettedb.cpp
@@ -25,7 +25,6 @@
#include "utils/files.h"
#include "resources/dyecolor.h"
-#include "resources/resourcemanager.h"
#include <map>
diff --git a/src/resources/map/map.cpp b/src/resources/map/map.cpp
index d18281c1a..c36065087 100644
--- a/src/resources/map/map.cpp
+++ b/src/resources/map/map.cpp
@@ -22,7 +22,6 @@
#include "resources/map/map.h"
-#include "client.h"
#include "configuration.h"
#include "render/graphics.h"
#include "notifications.h"
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 707834d1d..ff907bb53 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -22,7 +22,6 @@
#include "resources/resourcemanager.h"
-#include "animationdelayload.h"
#include "configuration.h"
#include "logger.h"
#include "navigationmanager.h"
@@ -40,12 +39,9 @@
#include "resources/spritedef.h"
#include "utils/delete2.h"
-#include "utils/mkdir.h"
-#include "utils/paths.h"
#include "utils/physfscheckutils.h"
#include "utils/physfsrwops.h"
#include "utils/sdlcheckutils.h"
-#include "utils/timer.h"
#include <SDL_image.h>
diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h
index 824fbddd5..16640c7fd 100644
--- a/src/resources/resourcemanager.h
+++ b/src/resources/resourcemanager.h
@@ -28,13 +28,11 @@
#include "utils/stringvector.h"
#include <ctime>
-#include <list>
#include <map>
#include <set>
#include "localconsts.h"
-class AnimationDelayLoad;
class Image;
class ImageSet;
class Map;
diff --git a/src/resources/wallpaper.cpp b/src/resources/wallpaper.cpp
index 979cf9844..0f2527d54 100644
--- a/src/resources/wallpaper.cpp
+++ b/src/resources/wallpaper.cpp
@@ -24,7 +24,6 @@
#include "configuration.h"
-#include "resources/resourcemanager.h"
#include "resources/wallpaperdata.h"
#include "utils/physfstools.h"