Fix paranthesis
authorMario <zacjardine@y7mail.com>
Sat, 13 Dec 2014 09:04:30 +0000 (20:04 +1100)
committerMario <zacjardine@y7mail.com>
Sat, 13 Dec 2014 09:04:30 +0000 (20:04 +1100)
qcsrc/server/g_damage.qc

index 0e8bef0..6cf3711 100644 (file)
@@ -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)
                                        {