updated primitives @damageof/@damagefoeof

This commit is contained in:
Anthony Calosa
2015-10-22 14:20:52 +08:00
parent 704f7f4494
commit fe86514fb8
2 changed files with 82 additions and 88 deletions

View File

@@ -1319,7 +1319,7 @@ public:
if (fromTc && !fromTc->canTarget(e->damage->source)) return 0;
if (type == 1 && e->damage->typeOfDamage != Damage::DAMAGE_COMBAT) return 0;
if (type == 2 && e->damage->typeOfDamage == Damage::DAMAGE_COMBAT) return 0;
if (e->damage->target->type_as_damageable == Damageable::DAMAGEABLE_PLAYER)
if (e->damage->target->type_as_damageable == Damageable::DAMAGEABLE_PLAYER)
{
Player * p = (Player *) e->damage->target;
if(thiscontroller)