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

1  2 
qcsrc/server/g_world.qc

diff --combined qcsrc/server/g_world.qc
  #include "../common/constants.qh"
  #include "../common/deathtypes.qh"
  #include "../common/mapinfo.qh"
 -#include "../common/monsters/monsters.qh"
 +#include "../common/monsters/all.qh"
  #include "../common/monsters/sv_monsters.qh"
  #include "../common/notifications.qh"
  #include "../common/playerstats.qh"
  #include "../common/stats.qh"
  #include "../common/teams.qh"
  #include "../common/util.qh"
 -#include "../common/weapons/weapons.qh"
 +#include "../common/items/all.qh"
 +#include "../common/weapons/all.qh"
  
  const float LATENCY_THINKRATE = 10;
  .float latency_sum;
@@@ -189,8 -188,6 +189,8 @@@ void cvar_changes_init(
                BADCVAR("g_configversion");
                BADCVAR("g_maplist_index");
                BADCVAR("halflifebsp");
 +              BADCVAR("sv_mapformat_is_quake2");
 +              BADCVAR("sv_mapformat_is_quake3");
                BADPREFIX("sv_world");
  
                // client
                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");
                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");
@@@ -559,7 -558,6 +561,7 @@@ void spawnfunc___init_dedicated_server(
        // needs to be done so early because of the constants they create
        CALL_ACCUMULATED_FUNCTION(RegisterWeapons);
        CALL_ACCUMULATED_FUNCTION(RegisterMonsters);
 +      CALL_ACCUMULATED_FUNCTION(RegisterItems);
        CALL_ACCUMULATED_FUNCTION(RegisterGametypes);
        CALL_ACCUMULATED_FUNCTION(RegisterNotifications);
        CALL_ACCUMULATED_FUNCTION(RegisterDeathtypes);
@@@ -608,7 -606,6 +610,7 @@@ void spawnfunc_worldspawn (void
        // needs to be done so early because of the constants they create
        CALL_ACCUMULATED_FUNCTION(RegisterWeapons);
        CALL_ACCUMULATED_FUNCTION(RegisterMonsters);
 +      CALL_ACCUMULATED_FUNCTION(RegisterItems);
        CALL_ACCUMULATED_FUNCTION(RegisterGametypes);
        CALL_ACCUMULATED_FUNCTION(RegisterNotifications);
        CALL_ACCUMULATED_FUNCTION(RegisterDeathtypes);