diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-05-25 14:13:51 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-05-25 14:13:51 +0300 |
| commit | e2f03241a1ba9d6b536b0b7a6f995e4e8d894408 (patch) | |
| tree | 2bfd5cda7899a5793de62b5f47925a09eac320f5 /src/particle/particle.cpp | |
| parent | 59271755dc75f5de6c288308df92f687deaa32b4 (diff) | |
| download | manaverse-e2f03241a1ba9d6b536b0b7a6f995e4e8d894408.tar.gz manaverse-e2f03241a1ba9d6b536b0b7a6f995e4e8d894408.tar.bz2 manaverse-e2f03241a1ba9d6b536b0b7a6f995e4e8d894408.tar.xz manaverse-e2f03241a1ba9d6b536b0b7a6f995e4e8d894408.zip | |
Move images load function from resourcemanager into separate file.
Diffstat (limited to 'src/particle/particle.cpp')
| -rw-r--r-- | src/particle/particle.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/particle/particle.cpp b/src/particle/particle.cpp index 422dbe561..3c3a0b836 100644 --- a/src/particle/particle.cpp +++ b/src/particle/particle.cpp @@ -34,7 +34,7 @@ #include "resources/dye/dye.h" -#include "resources/resourcemanager/resourcemanager.h" +#include "resources/loaders/imageloader.h" #include "utils/delete2.h" #include "utils/dtor.h" @@ -440,7 +440,7 @@ Particle *Particle::addEffect(const std::string &restrict particleEffectFile, imageSrc = XmlChildContent(node); if (!imageSrc.empty() && !dyePalettes.empty()) Dye::instantiate(imageSrc, dyePalettes); - Image *const img = resourceManager->getImage(imageSrc); + Image *const img = ImageLoader::getImage(imageSrc); newParticle = new ImageParticle(img); newParticle->setMap(mMap); |