From 58974e6733a39bd55b9511f0010e0a8b7cd49aa4 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 28 Mar 2013 13:52:32 +0300
Subject: Disable more particles if particle engine disabled.

---
 src/being.cpp               | 7 +++++--
 src/net/ea/beinghandler.cpp | 4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/being.cpp b/src/being.cpp
index c57532fbf..22ce33f41 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -1147,7 +1147,7 @@ void Being::setAction(const Action &action, const int attackId)
                             rotation = 270;
                             break;
                     }
-                    if (effectManager && effectId >= 0)
+                    if (Particle::enabled && effectManager && effectId >= 0)
                         effectManager->trigger(effectId, this, rotation);
                 }
             }
@@ -2780,8 +2780,11 @@ void Being::removeAfkEffect()
 
 void Being::addSpecialEffect(const int effect)
 {
-    if (effectManager && !mSpecialParticle && effect != -1)
+    if (effectManager && Particle::enabled
+        && !mSpecialParticle && effect != -1)
+    {
         mSpecialParticle = effectManager->triggerReturn(effect, this);
+    }
 }
 
 void Being::removeSpecialEffect()
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp
index 618c1b056..922a6155e 100644
--- a/src/net/ea/beinghandler.cpp
+++ b/src/net/ea/beinghandler.cpp
@@ -33,6 +33,7 @@
 #include "inputmanager.h"
 #include "keyboardconfig.h"
 #include "localplayer.h"
+#include "particle.h"
 #include "party.h"
 #include "playerrelations.h"
 #include "configuration.h"
@@ -563,7 +564,8 @@ void BeingHandler::processBeingSelfEffect(Net::MessageIn &msg)
 
     const int effectType = msg.readInt32();
 
-    effectManager->trigger(effectType, being);
+    if (Particle::enabled)
+        effectManager->trigger(effectType, being);
 
     //+++ need dehard code effectType == 3
     if (effectType == 3 && being->getType() == Being::PLAYER
-- 
cgit v1.2.3-60-g2f50