summaryrefslogtreecommitdiff
path: root/src/resources/animation
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-05-25 20:48:35 +0300
committerAndrei Karas <akaras@inbox.ru>2016-05-25 20:48:35 +0300
commit5994a6198ac35ea149a7211213dc296ee7406f44 (patch)
treeeec718594fd23da29f9d39e4c0fb00409d514a8e /src/resources/animation
parent1b1a7cea1c6b81438bacc86b93cb80a78430790f (diff)
downloadmv-5994a6198ac35ea149a7211213dc296ee7406f44.tar.gz
mv-5994a6198ac35ea149a7211213dc296ee7406f44.tar.bz2
mv-5994a6198ac35ea149a7211213dc296ee7406f44.tar.xz
mv-5994a6198ac35ea149a7211213dc296ee7406f44.zip
Move imageset load function from resourcemanager into separate file.
Diffstat (limited to 'src/resources/animation')
-rw-r--r--src/resources/animation/simpleanimation.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/resources/animation/simpleanimation.cpp b/src/resources/animation/simpleanimation.cpp
index bc67ad747..dd88eba4a 100644
--- a/src/resources/animation/simpleanimation.cpp
+++ b/src/resources/animation/simpleanimation.cpp
@@ -32,7 +32,7 @@
#include "resources/dye/dye.h"
-#include "resources/resourcemanager/resourcemanager.h"
+#include "resources/loaders/imagesetloader.h"
#include "utils/delete2.h"
@@ -159,7 +159,7 @@ void SimpleAnimation::initializeAnimation(const XmlNodePtr animationNode,
if (!imagePath.empty() && !dyePalettes.empty())
Dye::instantiate(imagePath, dyePalettes);
- const ImageSet *const imageset = resourceManager->getImageSet(
+ const ImageSet *const imageset = Loader::getImageSet(
XML::getProperty(animationNode, "imageset", ""),
XML::getProperty(animationNode, "width", 0),
XML::getProperty(animationNode, "height", 0));