Revert "Moved observe_blocked to a separate byte"

This reverts commit 9c1b8c373d637a99488c9f12363576c1435591dc.

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index 38e78e7ba32e455c67d009347011ec0da37fc0fa..72105bea5c92137c9851351c25586ef9994fd2dc 100644 (file)
--- 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 1bb725452827f579fd0c52e636049a008acb880d..c5c79ed02921cb6713de634246cc593b29431f4a 100644 (file)
--- 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);
 }