diff options
| -rw-r--r-- | src/effectmanager.cpp | 27 | ||||
| -rw-r--r-- | src/effectmanager.h | 15 |
2 files changed, 23 insertions, 19 deletions
diff --git a/src/effectmanager.cpp b/src/effectmanager.cpp index 2d235bbfe..f7e1ccbaa 100644 --- a/src/effectmanager.cpp +++ b/src/effectmanager.cpp @@ -51,7 +51,8 @@ EffectManager::EffectManager() mEffects.push_back(EffectDescription( XML::getProperty(node, "id", -1), XML::getProperty(node, "particle", ""), - XML::getProperty(node, "audio", ""))); + XML::getProperty(node, "audio", ""), + XML::getProperty(node, "sprite", ""))); } } } @@ -72,14 +73,14 @@ bool EffectManager::trigger(const int id, Being *const being, if ((*i).id == id) { rValue = true; - if (!(*i).GFX.empty()) + if (!(*i).gfx.empty()) { Particle *const selfFX = particleEngine->addEffect( - (*i).GFX, 0, 0, rotation); + (*i).gfx, 0, 0, rotation); being->controlParticle(selfFX); } - if (!(*i).SFX.empty()) - soundManager.playSfx((*i).SFX); + if (!(*i).sfx.empty()) + soundManager.playSfx((*i).sfx); break; } } @@ -97,14 +98,14 @@ Particle *EffectManager::triggerReturn(const int id, Being *const being, { if ((*i).id == id) { - if (!(*i).GFX.empty()) + if (!(*i).gfx.empty()) { rValue = particleEngine->addEffect( - (*i).GFX, 0, 0, rotation); + (*i).gfx, 0, 0, rotation); being->controlParticle(rValue); } - if (!(*i).SFX.empty()) - soundManager.playSfx((*i).SFX); + if (!(*i).sfx.empty()) + soundManager.playSfx((*i).sfx); break; } } @@ -123,10 +124,10 @@ bool EffectManager::trigger(const int id, const int x, const int y, if ((*i).id == id) { rValue = true; - if (!(*i).GFX.empty() && particleEngine) - particleEngine->addEffect((*i).GFX, x, y, rotation); - if (!(*i).SFX.empty()) - soundManager.playSfx((*i).SFX); + if (!(*i).gfx.empty() && particleEngine) + particleEngine->addEffect((*i).gfx, x, y, rotation); + if (!(*i).sfx.empty()) + soundManager.playSfx((*i).sfx); break; } } diff --git a/src/effectmanager.h b/src/effectmanager.h index fca033d97..95ecc3439 100644 --- a/src/effectmanager.h +++ b/src/effectmanager.h @@ -37,16 +37,19 @@ class EffectManager final public: struct EffectDescription { - EffectDescription(const int id0, const std::string &GFX0, - const std::string &SFX0) : + EffectDescription(const int id0, const std::string &gfx0, + const std::string &sfx0, + const std::string &sprite0) : id(id0), - GFX(GFX0), - SFX(SFX0) + gfx(gfx0), + sfx(sfx0), + sprite(sprite0) { } int id; - std::string GFX; - std::string SFX; + std::string gfx; + std::string sfx; + std::string sprite; }; EffectManager(); |