From: Mario Date: Sat, 13 Dec 2014 09:04:30 +0000 (+1100) Subject: Fix paranthesis X-Git-Tag: xonotic-v0.8.0~101 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ade8f916b2f6a10eda9d33c61f8d136f227cab69;p=xonotic%2Fxonotic-data.pk3dir.git Fix paranthesis --- diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index 0e8bef06b..6cf371127 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -854,6 +854,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float // count the damage if(attacker) if(!targ.deadflag) + if(deathtype != DEATH_BUFF_VENGEANCE if(targ.takedamage == DAMAGE_AIM) if(targ != attacker) { @@ -863,9 +864,9 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float else victim = targ; - if(IS_PLAYER(victim) || victim.turrcaps_flags & TFL_TURRCAPS_ISTURRET || victim.flags & FL_MONSTER) + if(IS_PLAYER(victim) || (victim.turrcaps_flags & TFL_TURRCAPS_ISTURRET) || (victim.flags & FL_MONSTER)) { - if(DIFF_TEAM(victim, attacker)) + if(DIFF_TEAM(victim, attacker) && !victim.frozen) { if(damage > 0) {