summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-03-28 13:52:32 +0300
committerAndrei Karas <akaras@inbox.ru>2013-03-28 13:52:32 +0300
commit58974e6733a39bd55b9511f0010e0a8b7cd49aa4 (patch)
tree6d8a62c7a87266353c8b4f65b4f16d759d6a8945
parent83dc7593205d7d076fc38d307e2964a57157defc (diff)
downloadmv-58974e6733a39bd55b9511f0010e0a8b7cd49aa4.tar.gz
mv-58974e6733a39bd55b9511f0010e0a8b7cd49aa4.tar.bz2
mv-58974e6733a39bd55b9511f0010e0a8b7cd49aa4.tar.xz
mv-58974e6733a39bd55b9511f0010e0a8b7cd49aa4.zip
Disable more particles if particle engine disabled.
-rw-r--r--src/being.cpp7
-rw-r--r--src/net/ea/beinghandler.cpp4
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