From: z411 <z411@omaera.org>
Date: Wed, 19 Oct 2022 18:52:27 +0000 (-0300)
Subject: Moved observe_blocked to a separate byte
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9c1b8c373d637a99488c9f12363576c1435591dc;p=xonotic%2Fxonotic-data.pk3dir.git

Moved observe_blocked to a separate byte
---

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index 72105bea5..38e78e7ba 100644
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -653,7 +653,6 @@ NET_HANDLE(ENT_CLIENT_CLIENTDATA, bool isnew)
 		newspectatee_status = 0;
 
 	spectatorbutton_zoom = (f & BIT(2));
-	observe_blocked = (f & BIT(3));
 
 	if(f & BIT(4))
 	{
@@ -1113,6 +1112,7 @@ NET_HANDLE(ENT_CLIENT_INIT, bool isnew)
 	damagepush_speedfactor = ReadByte() / 255.0;
 
 	serverflags = ReadByte();
+	observe_blocked = ReadByte();
 
 	g_trueaim_minrange = ReadCoord();
 
diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index c5c79ed02..1bb725452 100644
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -138,7 +138,6 @@ bool ClientData_Send(entity this, entity to, int sf)
 	if (CS(e).race_completed)       sf |= BIT(0); // forced scoreboard
 	if (CS(to).spectatee_status)    sf |= BIT(1); // spectator ent number follows
 	if (CS(e).zoomstate)            sf |= BIT(2); // zoomed
-	if (observe_blocked)            sf |= BIT(3); // observing blocked
 	if (autocvar_sv_showspectators == 1 || (autocvar_sv_showspectators && IS_SPEC(to)))
 	                                sf |= BIT(4); // show spectators
 
@@ -879,6 +878,7 @@ void ClientInit_misc(entity this)
 	WriteByte(channel, this.count * 255.0); // g_balance_armor_blockpercent
 	WriteByte(channel, this.cnt * 255.0); // g_balance_damagepush_speedfactor
 	WriteByte(channel, serverflags);
+	WriteByte(channel, observe_blocked);
 	WriteCoord(channel, autocvar_g_trueaim_minrange);
 }