Merge branch 'master' into terencehill/translate_colors_2

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / ent_cs.qh

diff --git a/qcsrc/common/ent_cs.qh b/qcsrc/common/ent_cs.qh
index e8d568af5e6d9bb833c84c5fbb17ebd9808ac24f..0d02e4b538e3f789981118358500052609b3399e 100644 (file)
--- a/qcsrc/common/ent_cs.qh
+++ b/qcsrc/common/ent_cs.qh
@@ -50,7 +50,8 @@ REGISTER_NET_TEMP(CLIENT_ENTCS)
        {
                AL_DELETE(_entcs);
        }
-       #define entcs_receiver(...) EVAL(OVERLOAD(entcs_receiver, __VA_ARGS__))
+       #define entcs_receiver(...) EVAL_entcs_receiver(OVERLOAD(entcs_receiver, __VA_ARGS__))
+       #define EVAL_entcs_receiver(...) __VA_ARGS__
        #define entcs_receiver_1(i) AL_gete(_entcs, i)
        #define entcs_receiver_2(i, v) AL_sete(_entcs, i, v)
        #define entcs_is_self(e) ((e).sv_entnum == player_localentnum - 1)
@@ -83,12 +84,12 @@ REGISTER_NET_TEMP(CLIENT_ENTCS)
        }
 
        /**
-        * Same as `entcs_GetTeam`, but returns -1 for no team
+        * Same as `entcs_GetTeam`, but returns -1 for no team in teamplay
         */
        int entcs_GetScoreTeam(int i)
        {
                int t = entcs_GetTeam(i);
-               if (!t) t = -1;
+               if (teamplay && !t) t = -1;
                return t;
        }