diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-03-16 18:05:12 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-03-16 18:15:50 +0300 |
| commit | ac65e2c9b72e35a9e5a1a84da57ecdbd41e5923e (patch) | |
| tree | 0feb142dc738715d3216f0832f94ae4c3716fc30 /src/being | |
| parent | 117c99ff5c8358624df6d176860ac64c86b6fa5f (diff) | |
| download | mv-ac65e2c9b72e35a9e5a1a84da57ecdbd41e5923e.tar.gz mv-ac65e2c9b72e35a9e5a1a84da57ecdbd41e5923e.tar.bz2 mv-ac65e2c9b72e35a9e5a1a84da57ecdbd41e5923e.tar.xz mv-ac65e2c9b72e35a9e5a1a84da57ecdbd41e5923e.zip | |
Split ParticleEngine from Particle class.
Diffstat (limited to 'src/being')
| -rw-r--r-- | src/being/actorsprite.cpp | 2 | ||||
| -rw-r--r-- | src/being/being.cpp | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/being/actorsprite.cpp b/src/being/actorsprite.cpp index 41f7d92bd..629fef7b6 100644 --- a/src/being/actorsprite.cpp +++ b/src/being/actorsprite.cpp @@ -318,7 +318,7 @@ void ActorSprite::setupSpriteDisplay(const SpriteDisplay &display, mChildParticleEffects.clear(); // setup particle effects - if (Particle::enabled && particleEngine) + if (ParticleEngine::enabled && particleEngine) { FOR_EACH (StringVectCIter, itr, display.particles) { diff --git a/src/being/being.cpp b/src/being/being.cpp index ccd28c79f..b24f10ecd 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -1498,7 +1498,7 @@ void Being::setAction(const BeingActionT &restrict action, reset(); // attack particle effect - if (Particle::enabled && effectManager) + if (ParticleEngine::enabled && effectManager) { const int effectId = mInfo->getAttack(attackId)->mEffectId; if (effectId >= 0) @@ -3879,7 +3879,7 @@ void Being::removeAfkEffect() restrict2 void Being::addSpecialEffect(const int effect) restrict2 { if (effectManager && - Particle::enabled && + ParticleEngine::enabled && !mSpecialParticle && effect != -1) { @@ -4179,7 +4179,8 @@ void Being::addItemParticles(const int id, return; // setup particle effects - if (Particle::enabled && particleEngine) + if (ParticleEngine::enabled && + particleEngine) { FOR_EACH (StringVectCIter, itr, display.particles) { @@ -4479,7 +4480,7 @@ void Being::setTrickDead(const bool b) restrict2 void Being::setSpiritBalls(const unsigned int balls) restrict2 { - if (!Particle::enabled) + if (!ParticleEngine::enabled) { mSpiritBalls = balls; return; |