]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'packer-/impure_team_cvars' into 'master'
authorMario <zacjardine@y7mail.com>
Thu, 9 Jul 2015 01:38:50 +0000 (01:38 +0000)
committerMario <zacjardine@y7mail.com>
Thu, 9 Jul 2015 01:38:50 +0000 (01:38 +0000)
add g_tdm_teams_override and g_domination_teams_override to cvar whitelist

Modifying default team number for gametype tdm or dom makes server impure

g_tdm_teams_override "3" // "0"
g_domination_teams_override "3" // "0"

ca, freezetag and keyhunt are already whitelisted
grep teams_override g_world.qc
BADCVAR("g_ca_teams_override");
BADCVAR("g_freezetag_teams_override");
BADCVAR("g_keyhunt_teams_override");

See merge request !139

qcsrc/server/g_world.qc

index a31670a08a050f6997b9eb6f81e2277e3cdfe584..2c4c863ed3fdd0db00e4bd1cf674b4a1bf3908ad 100644 (file)
@@ -376,6 +376,7 @@ void cvar_changes_init()
                BADCVAR("g_ca_teams_override");
                BADCVAR("g_ctf_ignore_frags");
                BADCVAR("g_domination_point_limit");
+               BADCVAR("g_domination_teams_override");
                BADCVAR("g_freezetag_teams_override");
                BADCVAR("g_friendlyfire");
                BADCVAR("g_fullbrightitems");
@@ -396,6 +397,7 @@ void cvar_changes_init()
                BADCVAR("g_nexball_goallimit");
                BADCVAR("g_powerups");
                BADCVAR("g_start_delay");
+               BADCVAR("g_tdm_teams_override");
                BADCVAR("g_warmup");
                BADCVAR("g_weapon_stay"); BADPRESUFFIX("g_", "_weapon_stay");
                BADCVAR("hostname");