Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index b9acee43c235f9b5219c5bcbe443fee1e17bc7c2..1438d317c76947d9fd04cec4477a49f1d5b15e15 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -1095,6 +1095,7 @@ float ClientInit_SendEntity(entity to, float sf)
        WriteCoord(MSG_ENTITY, self.bouncestop); // g_balance_grenadelauncher_bouncestop
        WriteByte(MSG_ENTITY, cvar("g_balance_nex_secondary")); // client has to know if it should zoom or not
        WriteByte(MSG_ENTITY, cvar("g_balance_campingrifle_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
        return TRUE;
 }
 

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index e0e548001799bee791270e7d9a8b23d579a286ae..c5abb52f592ed30d817fa21574035e64b9f7a207 100644 (file)
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -403,6 +403,7 @@ void cvar_changes_init()
                BADCVAR("g_maplist_votable_abstain");
                BADCVAR("g_maplist_votable_nodetail");
                BADCVAR("g_maplist_votable_suggestions");
+               BADCVAR("g_minstagib");
                BADCVAR("g_nexball_goallimit");
                BADCVAR("g_runematch_point_limit");
                BADCVAR("g_start_delay");