Merge branch 'master' into terencehill/itemstime

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

diff --git a/qcsrc/server/waypointsprites.qc b/qcsrc/server/waypointsprites.qc
index 736cc564cc4c81bffaae6096cddc11b46c8ac867..507c0551b2db4127b10bbe8f7ed21d5b735300b2 100644 (file)
--- a/qcsrc/server/waypointsprites.qc
+++ b/qcsrc/server/waypointsprites.qc
@@ -193,7 +193,12 @@ float WaypointSprite_visible_for_player(entity e)
                        return FALSE;
 
        // team waypoints
                        return FALSE;
 
        // team waypoints

-       if(self.team && self.rule == SPRITERULE_DEFAULT)
+       if(self.rule == SPRITERULE_SPECTATOR)
+       {
+               if(!warmup_stage && e.classname == "player")
+                       return FALSE;
+       }
+       else if(self.team && self.rule == SPRITERULE_DEFAULT)

        {
                if(self.team != e.team)
                        return FALSE;
        {
                if(self.team != e.team)
                        return FALSE;