Early addition of a particle effect disabling option. Would like to

change this in the future to update instantaneously. 

1 files changed, 9 insertions, 7 deletions

diff --git a/src/monster.cpp b/src/monster.cpp
index 61f1f5c3..be22bed3 100644
--- a/src/monster.cpp
+++ b/src/monster.cpp
@@ -65,13 +65,15 @@ Monster::Monster(Uint32 id, Uint16 job, Map *map):
         mSprites[c] = AnimatedSprite::load("graphics/sprites/error.xml");
     }
 
-    const std::list<std::string> &particleEffects = info.getParticleEffects();
-    for (   std::list<std::string>::const_iterator i = particleEffects.begin();
-            i != particleEffects.end();
-            i++
-        )
+    if (mParticleEffects)
     {
-        controlParticle(particleEngine->addEffect((*i), 0, 0));
+        const std::list<std::string> &particleEffects = info.getParticleEffects();
+        for (   std::list<std::string>::const_iterator i = particleEffects.begin();
+                i != particleEffects.end(); i++
+            )
+        {
+            controlParticle(particleEngine->addEffect((*i), 0, 0));
+        }
     }
 }
 
@@ -122,7 +124,7 @@ void Monster::setAction(Action action)
 
             //attack particle effect
             particleEffect = getInfo().getAttackParticleEffect();
-            if (particleEffect != "")
+            if (particleEffect != "" && mParticleEffects)
             {
                 switch (mDirection)
                 {