diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-08-22 14:14:34 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-08-22 14:14:34 +0300 |
| commit | da05d9dd98315378bdded216184294f376643191 (patch) | |
| tree | ffc4b984c73c3bb68d26a1df6481634254075744 /src/particle/particle.cpp | |
| parent | ec856b2026c7ceecab5f74942bb36661d7c6ae67 (diff) | |
| download | plus-da05d9dd98315378bdded216184294f376643191.tar.gz plus-da05d9dd98315378bdded216184294f376643191.tar.bz2 plus-da05d9dd98315378bdded216184294f376643191.tar.xz plus-da05d9dd98315378bdded216184294f376643191.zip | |
Use resource manager as global variable.
Diffstat (limited to 'src/particle/particle.cpp')
| -rw-r--r-- | src/particle/particle.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/particle/particle.cpp b/src/particle/particle.cpp index f270dcc79..9dee09754 100644 --- a/src/particle/particle.cpp +++ b/src/particle/particle.cpp @@ -301,8 +301,6 @@ Particle *Particle::addEffect(const std::string &particleEffectFile, return nullptr; } - ResourceManager *const resman = ResourceManager::getInstance(); - // Parse particles for_each_xml_child_node(effectChildNode, rootNode) { @@ -337,7 +335,7 @@ Particle *Particle::addEffect(const std::string &particleEffectFile, } if (!imageSrc.empty() && !dyePalettes.empty()) Dye::instantiate(imageSrc, dyePalettes); - Image *const img = resman->getImage(imageSrc); + Image *const img = resourceManager->getImage(imageSrc); newParticle = new ImageParticle(img); newParticle->setMap(mMap); |