From bb8be1acea37f09c134d7d4042869a679cf8a12b Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 25 May 2016 19:14:07 +0300 Subject: Move sub images load function from resourcemanager into separate file. --- src/particle/particleemitter.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/particle') diff --git a/src/particle/particleemitter.cpp b/src/particle/particleemitter.cpp index fa0f45fc7..eaebc16fd 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/subimageloader.h" #include "resources/resourcemanager/resourcemanager.h" @@ -136,7 +137,7 @@ ParticleEmitter::ParticleEmitter(const XmlNodePtrConst emitterNode, Image *img = ImageLoader::getImage(image); if (img) { - mParticleImage = resourceManager->getSubImage(img, + mParticleImage = Loader::getSubImage(img, XML::getProperty(propertyNode, "x", 0), XML::getProperty(propertyNode, "y", 0), XML::getProperty(propertyNode, "width", 0), @@ -377,7 +378,7 @@ ImageSet *ParticleEmitter::getImageSet(XmlNodePtrConst node) if (!img) return nullptr; - Image *const img2 = resourceManager->getSubImage(img, subX, + Image *const img2 = Loader::getSubImage(img, subX, XML::getProperty(node, "subY", 0), XML::getProperty(node, "subWidth", 0), XML::getProperty(node, "subHeight", 0)); -- cgit v1.2.3-60-g2f50