summaryrefslogtreecommitdiff
path: root/src/particle
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-05-25 22:17:03 +0300
committerAndrei Karas <akaras@inbox.ru>2016-05-25 22:17:03 +0300
commitea0809826d530f82dc84f8e046b3d11a797dd716 (patch)
tree65b8141e1c9d3591ad95f771a7ca2c4667865e81 /src/particle
parent5994a6198ac35ea149a7211213dc296ee7406f44 (diff)
downloadmv-ea0809826d530f82dc84f8e046b3d11a797dd716.tar.gz
mv-ea0809826d530f82dc84f8e046b3d11a797dd716.tar.bz2
mv-ea0809826d530f82dc84f8e046b3d11a797dd716.tar.xz
mv-ea0809826d530f82dc84f8e046b3d11a797dd716.zip
Move subimageset load function from resourcemanager into separate file.
Diffstat (limited to 'src/particle')
-rw-r--r--src/particle/particleemitter.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/particle/particleemitter.cpp b/src/particle/particleemitter.cpp
index a4c565393..552831abc 100644
--- a/src/particle/particleemitter.cpp
+++ b/src/particle/particleemitter.cpp
@@ -37,8 +37,7 @@
#include "resources/loaders/imageloader.h"
#include "resources/loaders/imagesetloader.h"
#include "resources/loaders/subimageloader.h"
-
-#include "resources/resourcemanager/resourcemanager.h"
+#include "resources/loaders/subimagesetloader.h"
#include "debug.h"
@@ -389,7 +388,7 @@ ImageSet *ParticleEmitter::getImageSet(XmlNodePtrConst node)
return nullptr;
}
- imageset = resourceManager->getSubImageSet(img2,
+ imageset = Loader::getSubImageSet(img2,
XML::getProperty(node, "width", 0),
XML::getProperty(node, "height", 0));
img2->decRef();