Show to spectators all the waypoints that are shown to spectated players. It fixes...

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

diff --git a/qcsrc/common/ent_cs.qc b/qcsrc/common/ent_cs.qc
index 7aad7847241d24beaeda9f5c567960199decb9a7..da53f68a0f15d52a06d7522566fe062a4047ad4c 100644 (file)
--- a/qcsrc/common/ent_cs.qc
+++ b/qcsrc/common/ent_cs.qc
@@ -75,7 +75,7 @@ MACRO_END
                do {
                        if (radar_showennemies) break;
                        if (SAME_TEAM(to, player)) break;
-                       if (!IS_PLAYER(to) && time > game_starttime) break;
+                       if (!(IS_PLAYER(to) || to.caplayer) && time > game_starttime) break;
                        sf &= ENTCS_PUBLICMASK; // no private updates
                } while (0);
                sf |= this.m_forceupdate;
@@ -175,33 +175,26 @@ MACRO_END
        {
                int n = ReadByte();
                entity e = entcs_receiver(n);
-               #define X(e) { \
-                       setthink(e, entcs_think); \
-                       entcs_receiver(n, e); \
-               }
                if (e == NULL)
                {
                        if (!this)
-                       {
                                // initial = temp
                                e = new_pure(entcs_receiver);
-                               X(e);
-                       }
                        else
-                       {
                                // initial = linked
                                e = this;
-                               X(e);
-                       }
+                       setthink(e, entcs_think);
+                       entcs_receiver(n, e);
                }
                else if (e != this && this)
                {
                        // upgrade to linked
                        delete(e);
                        e = this;
-                       X(e);
+                       setthink(e, entcs_think);
+                       entcs_receiver(n, e);
                }
-               #undef X
+
                InterpolateOrigin_Undo(e);
                e.sv_entnum = n;
                int sf = ReadShort();