Fix merge conflict and add an option to disable showspectators on the server

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 1be91c72f2034c603985cf49b3ba2ab594020bdd..89055c8901e5581081165b4c03c38d5656d05beb 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1454,12 +1454,10 @@ set cl_fullbright_items 0 "enable fullbright items (if server allows, controled
 set cl_weapon_stay_color "2 0.5 0.5" "Color of picked up weapons when g_weapon_stay > 0"
 set cl_weapon_stay_alpha 0.75 "Alpha of picked up weapons when g_weapon_stay > 0"
 
-<<<<<<< HEAD
 set sv_showspectators 0
-set cl_showspectators 1
-=======
+seta cl_showspectators 1
+
 // Facility for config.cfg use ONLY.
 // Interpreted in post-config.cfg.
 seta menu_forced_saved_cvars "" "These cvars will always be saved, despite engine/Xonotic cvar saving status"
 set menu_reverted_nonsaved_cvars "" "These cvars are currently marked as saved in the flags, but have been reverted and won't stay saved. INTERNAL USE ONLY."
->>>>>>> master

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index 78dfc8062cf335e5576102bd4466c203a8d68805..fc50ee1aee479b918ba3b6b7e1f6ead144353669 100644 (file)
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -574,3 +574,4 @@ float autocvar_sv_stopspeed;
 float autocvar_sv_airaccelerate;
 float autocvar_sv_airstopaccelerate;
 float autocvar_sv_track_canjump;
+bool autocvar_sv_showspectators;

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index f375e71f0a428ae3516ed1c7e99e214c1a77ad07..5f0eb1663aeec2df3effd508fe2a40cf9e6e81f3 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -111,7 +111,7 @@ bool ClientData_Send(entity this, entity to, int sf)
        if (to.spectatee_status)    sf |= 2; // spectator ent number follows
        if (e.zoomstate)            sf |= 4; // zoomed
        if (e.porto_v_angle_held)   sf |= 8; // angles held
-       sf |= 16; // always check spectators
+       if (autocvar_sv_showspectators) sf |= 16; // show spectators
 
        WriteHeader(MSG_ENTITY, ENT_CLIENT_CLIENTDATA);
        WriteByte(MSG_ENTITY, sf);