diff options
Diffstat (limited to 'src/being.cpp')
| -rw-r--r-- | src/being.cpp | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/src/being.cpp b/src/being.cpp index 3a7f08dda..eae4ebd66 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -606,10 +606,25 @@ void Being::takeDamage(Being *attacker, int amount, AttackType type) if (effectManager) { - if (type != CRITICAL) - effectManager->trigger(26, this); + // Init the particle effect path based on current + // weapon or default. + int hitEffectId = 0; + const ItemInfo *attackerWeapon = attacker->getEquippedWeapon(); + if (attacker->getType() == PLAYER && attackerWeapon) + { + if (type != CRITICAL) + hitEffectId = attackerWeapon->getHitEffectId(); + else + hitEffectId = attackerWeapon->getCriticalHitEffectId(); + } else - effectManager->trigger(28, this); + { + if (type != CRITICAL) + hitEffectId = paths.getIntValue("hitEffectId"); + else + hitEffectId = paths.getIntValue("criticalHitEffectId"); + } + effectManager->trigger(hitEffectId, this); } } } @@ -624,7 +639,7 @@ void Being::handleAttack(Being *victim, int damage, setAction(Being::ATTACK, 1); if (getType() == PLAYER && mEquippedWeapon) - fireMissile(victim, mEquippedWeapon->getMissileParticle()); + fireMissile(victim, mEquippedWeapon->getMissileParticleFile()); else if (mInfo->getAttack(mAttackType)) fireMissile(victim, mInfo->getAttack(mAttackType)->missileParticle); |