summaryrefslogtreecommitdiff
path: root/src/resources/mapreader.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-05-26 00:59:29 +0300
committerAndrei Karas <akaras@inbox.ru>2016-05-26 00:59:29 +0300
commitafc144cfe396f10eea5b160c711eec4b20ae00c3 (patch)
tree0f44c6c35f26628e8477d29090716dbdc2098f74 /src/resources/mapreader.cpp
parentea0809826d530f82dc84f8e046b3d11a797dd716 (diff)
downloadmv-afc144cfe396f10eea5b160c711eec4b20ae00c3.tar.gz
mv-afc144cfe396f10eea5b160c711eec4b20ae00c3.tar.bz2
mv-afc144cfe396f10eea5b160c711eec4b20ae00c3.tar.xz
mv-afc144cfe396f10eea5b160c711eec4b20ae00c3.zip
Move atlas load function from resourcemanager into separate file.
Diffstat (limited to 'src/resources/mapreader.cpp')
-rw-r--r--src/resources/mapreader.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index 161144a7d..9cc2542a5 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -42,6 +42,7 @@
#ifdef USE_OPENGL
#include "resources/db/mapdb.h"
+#include "resources/loaders/atlasloader.h"
#endif
#include "resources/map/tileanimation.h"
@@ -351,8 +352,9 @@ Map *MapReader::readMap(XmlNodePtrConst node, const std::string &path)
const MapInfo *const info = MapDB::getMapAtlas(fileName);
if (info)
{
- map->setAtlas(resourceManager->getAtlas(
- info->atlas, *info->files));
+ map->setAtlas(Loader::getAtlas(
+ info->atlas,
+ *info->files));
}
}
BLOCK_END("MapReader::readMap load atlas")