Merge remote-tracking branch 'origin/master' into fruitiex/animations

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

diff --git a/qcsrc/server/ent_cs.qc b/qcsrc/server/ent_cs.qc
index 3ffcb3b3868aa23f16e7628ab816fbb75a5a1ea7..f127fb26e83e7a4471b7f6dfe09faaacf648becd 100644 (file)
--- a/qcsrc/server/ent_cs.qc
+++ b/qcsrc/server/ent_cs.qc
@@ -30,8 +30,8 @@ float entcs_customize()
                return FALSE;
        if(other == o)
                return FALSE;
-       if(other.classname == "player")
-               if(!teams_matter || o.team != other.team)
+       if((other.classname == "player") || other.caplayer)
+               if(!teamplay || o.team != other.team)
                        if not (radar_showennemies)
                                return FALSE;
        return TRUE;