Make some nice macros for team comparisons

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / g_damage.qc

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 61bde55c7fabaa952ceeb9dccae6881c5b226b64..8c275822481d1a30ad13ac8020de9921389398c3 100644 (file)
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -56,22 +56,6 @@ float damage_gooddamage;
 .float istypefrag;
 .float taunt_soundtime;
 
-
-float IsDifferentTeam(entity a, entity b)
-{
-       if(teamplay)
-       {
-               if(a.team == b.team)
-                       return 0;
-       }
-       else
-       {
-               if(a == b)
-                       return 0;
-       }
-       return 1;
-}
-
 float IsFlying(entity a)
 {
        if(a.flags & FL_ONGROUND)
@@ -409,7 +393,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype)
        // ======
        else if(IS_PLAYER(attacker))
        {
-               if(!IsDifferentTeam(attacker, targ))
+               if(SAME_TEAM(attacker, targ))
                {
                        LogDeath("tk", deathtype, attacker, targ);
                        GiveFrags(attacker, targ, -1, deathtype);
@@ -600,7 +584,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
        if(DEATH_ISWEAPON(deathtype, WEP_HOOK) || DEATH_ISWEAPON(deathtype, WEP_TUBA))
        {
                if(IS_PLAYER(targ))
-                       if not(IsDifferentTeam(targ, attacker))
+                       if(SAME_TEAM(targ, attacker))
                        {
                                self = oldself;
                                return;
@@ -633,7 +617,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
                                damage = 0;
                                force = '0 0 0';
                        }
-                       else if(!IsDifferentTeam(attacker, targ))
+                       else if(SAME_TEAM(attacker, targ))
                        {
                                if(autocvar_teamplay_mode == 1)
                                        damage = 0;
@@ -746,7 +730,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 
                        if(IS_PLAYER(victim) || victim.turrcaps_flags & TFL_TURRCAPS_ISTURRET)
                        {
-                               if(IsDifferentTeam(victim, attacker))
+                               if(DIFF_TEAM(victim, attacker))
                                {
                                        if(damage > 0)
                                        {