diff options
| author | Fate <fate-tmw@googlemail.com> | 2008-12-09 09:42:59 -0700 |
|---|---|---|
| committer | Fate <fate-tmw@googlemail.com> | 2008-12-09 09:42:59 -0700 |
| commit | 5de95ae6a741ac8549a9e51be4a3872e91764d24 (patch) | |
| tree | cce603d128c9ccf7c53eced54a424a3a66e27bbc /src/statuseffect.cpp | |
| parent | caee40df5da03eb2db6ed8d528f1561ef9bcbd34 (diff) | |
| download | mana-5de95ae6a741ac8549a9e51be4a3872e91764d24.tar.gz mana-5de95ae6a741ac8549a9e51be4a3872e91764d24.tar.bz2 mana-5de95ae6a741ac8549a9e51be4a3872e91764d24.tar.xz mana-5de95ae6a741ac8549a9e51be4a3872e91764d24.zip | |
Defer re-adding of particles to next call to Being::logic() to avoid crash
Diffstat (limited to 'src/statuseffect.cpp')
| -rw-r--r-- | src/statuseffect.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/statuseffect.cpp b/src/statuseffect.cpp index 8aeb66c6..6397f615 100644 --- a/src/statuseffect.cpp +++ b/src/statuseffect.cpp @@ -30,7 +30,8 @@ #define STATUS_EFFECTS_FILE "status-effects.xml" -StatusEffect::StatusEffect() +StatusEffect::StatusEffect() : + mPersistentParticleEffect(false) {} StatusEffect::~StatusEffect() @@ -156,13 +157,12 @@ void StatusEffect::load() startEffect->mParticleEffect = XML::getProperty(node, "start-particle", ""); startEffect->mIcon = XML::getProperty(node, "icon", ""); startEffect->mAction = XML::getProperty(node, "action", ""); + startEffect->mPersistentParticleEffect = (XML::getProperty(node, "persistent-particle-effect", "no")) != "no"; endEffect->mMessage = XML::getProperty(node, "end-message", ""); endEffect->mSFXEffect = XML::getProperty(node, "end-audio", ""); endEffect->mParticleEffect = XML::getProperty(node, "end-particle", ""); - endEffect->mPersistentParticleEffect = (XML::getProperty(node, "persistent-particle-effect", "no")) != "no"; - (*the_map)[1][index] = startEffect; (*the_map)[0][index] = endEffect; } |