summaryrefslogtreecommitdiff
path: root/src/resources/atlas
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-05-24 23:09:33 +0300
committerAndrei Karas <akaras@inbox.ru>2016-05-24 23:14:31 +0300
commitd0a3a9f0f6dd3571e9f3a15bf4f8493a46d69eef (patch)
treed7204315244dc0a820df3c7834647893e83653e7 /src/resources/atlas
parent21ea310d2fa35a38efdd63e01685262dd77f8bad (diff)
downloadmv-d0a3a9f0f6dd3571e9f3a15bf4f8493a46d69eef.tar.gz
mv-d0a3a9f0f6dd3571e9f3a15bf4f8493a46d69eef.tar.bz2
mv-d0a3a9f0f6dd3571e9f3a15bf4f8493a46d69eef.tar.xz
mv-d0a3a9f0f6dd3571e9f3a15bf4f8493a46d69eef.zip
Move resourcemanager into subdirectory.
Diffstat (limited to 'src/resources/atlas')
-rw-r--r--src/resources/atlas/atlasmanager.cpp3
-rw-r--r--src/resources/atlas/atlasresource.cpp4
2 files changed, 4 insertions, 3 deletions
diff --git a/src/resources/atlas/atlasmanager.cpp b/src/resources/atlas/atlasmanager.cpp
index 03d0b40fd..7a375b243 100644
--- a/src/resources/atlas/atlasmanager.cpp
+++ b/src/resources/atlas/atlasmanager.cpp
@@ -35,7 +35,6 @@
#include "resources/imagehelper.h"
#include "resources/openglimagehelper.h"
-#include "resources/resourcemanager.h"
#include "resources/sdlimagehelper.h"
#include "resources/atlas/atlasitem.h"
@@ -44,6 +43,8 @@
#include "resources/dye/dye.h"
+#include "resources/resourcemanager/resourcemanager.h"
+
#include "debug.h"
AtlasManager::AtlasManager()
diff --git a/src/resources/atlas/atlasresource.cpp b/src/resources/atlas/atlasresource.cpp
index 48561bbbc..5f2e24160 100644
--- a/src/resources/atlas/atlasresource.cpp
+++ b/src/resources/atlas/atlasresource.cpp
@@ -22,12 +22,12 @@
#include "resources/atlas/atlasresource.h"
-#include "resources/resourcemanager.h"
-
#include "resources/atlas/atlasitem.h"
#include "resources/atlas/atlasmanager.h"
#include "resources/atlas/textureatlas.h"
+#include "resources/resourcemanager/resourcemanager.h"
+
#include "debug.h"
AtlasResource::~AtlasResource()