]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Revert "extract serverflags from the stat" because an engine bug breaks it
authorRudolf Polzer <divverent@alientrap.org>
Sat, 24 Dec 2011 22:44:00 +0000 (23:44 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 24 Dec 2011 22:44:00 +0000 (23:44 +0100)
This reverts commit 709cb52de7fca9bf94c2dd865acbade6b57e0a91.

qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/server/cl_client.qc

index a03eb58579a83f9a7227011cae31f5e955c49bd6..8c7c6bc0c7a47509695dd131d48682dca0fdf4f8 100644 (file)
@@ -1195,6 +1195,8 @@ void Ent_Init()
        nex_scope = !ReadByte();
        rifle_scope = !ReadByte();
 
+       serverflags = ReadByte();
+
        minelayer_maxmines = ReadByte();
 
        hagar_maxrockets = ReadByte();
index 65c9fe31c7fbbb2808007de9e73a5f6ced69ebb8..ac2f12cb52a9eba1196579b8616b4a6631d6d53a 100644 (file)
@@ -373,7 +373,6 @@ void CSQC_UpdateView(float w, float h)
        float a;
 
        hud = getstati(STAT_HUD);
-       serverflags = getstati(STAT_ITEMS, 28, 4);
 
        if(checkextension("DP_CSQC_MINFPS_QUALITY"))
                view_quality = getproperty(VF_MINFPS_QUALITY);
index 3cc16f618094c80f11a30cd60cb3b3c1ff0d9b9f..9ddcaabac3fb991128d2c9c49337d0a189c59409 100644 (file)
@@ -959,6 +959,7 @@ float ClientInit_SendEntity(entity to, float sf)
        WriteCoord(MSG_ENTITY, self.ebouncestop); // g_balance_grenadelauncher_bouncestop
        WriteByte(MSG_ENTITY, autocvar_g_balance_nex_secondary); // client has to know if it should zoom or not
        WriteByte(MSG_ENTITY, autocvar_g_balance_rifle_secondary); // client has to know if it should zoom or not
+       WriteByte(MSG_ENTITY, serverflags); // client has to know if it should zoom or not
        WriteByte(MSG_ENTITY, autocvar_g_balance_minelayer_limit); // minelayer max mines
        WriteByte(MSG_ENTITY, autocvar_g_balance_hagar_secondary_load_max); // hagar max loadable rockets
        WriteCoord(MSG_ENTITY, autocvar_g_trueaim_minrange);