From a16fcfec247504fdcaac0ff747a1ea81fb954d8f Mon Sep 17 00:00:00 2001 From: z411 Date: Wed, 19 Oct 2022 19:43:55 -0300 Subject: [PATCH] Revert "Moved observe_blocked to a separate byte" This reverts commit 9c1b8c373d637a99488c9f12363576c1435591dc. --- qcsrc/client/main.qc | 2 +- qcsrc/server/client.qc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc index 38e78e7ba..72105bea5 100644 --- a/qcsrc/client/main.qc +++ b/qcsrc/client/main.qc @@ -653,6 +653,7 @@ NET_HANDLE(ENT_CLIENT_CLIENTDATA, bool isnew) newspectatee_status = 0; spectatorbutton_zoom = (f & BIT(2)); + observe_blocked = (f & BIT(3)); if(f & BIT(4)) { @@ -1112,7 +1113,6 @@ 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 1bb725452..c5c79ed02 100644 --- a/qcsrc/server/client.qc +++ b/qcsrc/server/client.qc @@ -138,6 +138,7 @@ 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 @@ -878,7 +879,6 @@ 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); } -- 2.39.2