summaryrefslogtreecommitdiff
path: root/src/being
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-12-22 02:20:36 +0300
committerAndrei Karas <akaras@inbox.ru>2017-12-22 02:20:36 +0300
commitb54c0e944974669c4b5c1eb3f8018547c2179630 (patch)
treec0a08d7727f6aa0a1a9ed75f8ac14ec7a67f7a85 /src/being
parent1ff17739796e327e30a78b544be9865420d4c807 (diff)
downloadmv-b54c0e944974669c4b5c1eb3f8018547c2179630.tar.gz
mv-b54c0e944974669c4b5c1eb3f8018547c2179630.tar.bz2
mv-b54c0e944974669c4b5c1eb3f8018547c2179630.tar.xz
mv-b54c0e944974669c4b5c1eb3f8018547c2179630.zip
Remove default parameters from effectmanager.
Diffstat (limited to 'src/being')
-rw-r--r--src/being/being.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp
index ad68a4657..6bb49a0c8 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -828,7 +828,7 @@ void Being::takeDamage(Being *restrict const attacker,
attackId,
level);
if (hitEffectId >= 0)
- effectManager->trigger(hitEffectId, this);
+ effectManager->trigger(hitEffectId, this, 0);
}
}
else
@@ -851,7 +851,7 @@ void Being::takeDamage(Being *restrict const attacker,
level);
}
if (hitEffectId >= 0)
- effectManager->trigger(hitEffectId, this);
+ effectManager->trigger(hitEffectId, this, 0);
}
}
BLOCK_END("Being::takeDamage2")
@@ -4798,7 +4798,7 @@ void Being::setEmote(const uint8_t emotion,
const int effectId = info->effectId;
if (effectId >= 0)
{
- effectManager->trigger(effectId, this);
+ effectManager->trigger(effectId, this, 0);
}
}
}
@@ -4874,7 +4874,9 @@ void Being::addSpecialEffect(const int effect) restrict2
(mSpecialParticle == nullptr) &&
effect != -1)
{
- mSpecialParticle = effectManager->triggerReturn(effect, this);
+ mSpecialParticle = effectManager->triggerReturn(effect,
+ this,
+ 0);
}
}
@@ -5441,7 +5443,8 @@ void Being::addSpiritBalls(const unsigned int balls,
{
Particle *const particle = effectManager->triggerReturn(
effectId,
- this);
+ this,
+ 0);
mSpiritParticles.push_back(particle);
}
}