From 3b234314f7b507e63dbef835ea7229b003df09f3 Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 22 Jul 2016 02:30:40 +1000 Subject: [PATCH] Fix merge conflict and add an option to disable showspectators on the server --- defaultXonotic.cfg | 6 ++---- qcsrc/server/autocvars.qh | 1 + qcsrc/server/cl_client.qc | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 1be91c72f..89055c890 100644 --- 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 78dfc8062..fc50ee1ae 100644 --- 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 f375e71f0..5f0eb1663 100644 --- 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); -- 2.39.2