summaryrefslogtreecommitdiff
path: root/src/particle/particleemitter.cpp
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/particle/particleemitter.cpp
parent1b1a7cea1c6b81438bacc86b93cb80a78430790f (diff)
downloadplus-5994a6198ac35ea149a7211213dc296ee7406f44.tar.gz
plus-5994a6198ac35ea149a7211213dc296ee7406f44.tar.bz2
plus-5994a6198ac35ea149a7211213dc296ee7406f44.tar.xz
plus-5994a6198ac35ea149a7211213dc296ee7406f44.zip
Move imageset load function from resourcemanager into separate file.
Diffstat (limited to 'src/particle/particleemitter.cpp')
-rw-r--r--src/particle/particleemitter.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/particle/particleemitter.cpp b/src/particle/particleemitter.cpp
index 1cfe93f6e..a4c565393 100644
--- a/src/particle/particleemitter.cpp
+++ b/src/particle/particleemitter.cpp
@@ -35,6 +35,7 @@
#include "resources/dye/dye.h"
#include "resources/loaders/imageloader.h"
+#include "resources/loaders/imagesetloader.h"
#include "resources/loaders/subimageloader.h"
#include "resources/resourcemanager/resourcemanager.h"
@@ -396,7 +397,7 @@ ImageSet *ParticleEmitter::getImageSet(XmlNodePtrConst node)
}
else
{
- imageset = resourceManager->getImageSet(
+ imageset = Loader::getImageSet(
XML::getProperty(node, "imageset", ""),
XML::getProperty(node, "width", 0),
XML::getProperty(node, "height", 0));