Merge remote branch 'refs/remotes/origin/fruitiex/racefixes'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / g_world.qc

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index 061b4a11740922b3bcb96662a77455d5502c01db..ce7b8e2a15720eec91658e0c48b93faf9e832b8b 100644 (file)
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -246,22 +246,30 @@ void cvar_changes_init()
                BADPREFIX("sv_world");
 
                // client
+               BADPREFIX("chase_");
                BADPREFIX("cl_");
                BADPREFIX("con_");
+               BADPREFIX("scoreboard_");
                BADPREFIX("g_campaign");
                BADPREFIX("gl_");
                BADPREFIX("joy");
+               BADPREFIX("hud_");
                BADPREFIX("menu_");
                BADPREFIX("net_slist_");
                BADPREFIX("r_");
                BADPREFIX("sbar_");
                BADPREFIX("scr_");
+               BADPREFIX("snd_");
                BADPREFIX("userbind");
                BADPREFIX("v_");
                BADPREFIX("vid_");
                BADPREFIX("crosshair");
                BADCVAR("mod_q3bsp_lightmapmergepower");
                BADCVAR("mod_q3bsp_nolightmaps");
+               BADCVAR("fov");
+               BADCVAR("mastervolume");
+               BADCVAR("volume");
+               BADCVAR("bgmvolume");
 
                // private
                BADCVAR("serverconfig");
@@ -290,6 +298,8 @@ void cvar_changes_init()
                BADCVAR("net_address");
                BADCVAR("net_address_ipv6");
                BADPREFIX("sv_weaponstats_");
+               BADCVAR("developer");
+               BADPREFIX("developer_");
 
                // mapinfo
                BADCVAR("timelimit");
@@ -335,11 +345,15 @@ void cvar_changes_init()
 
                // does nothing visible
                BADPREFIX("prvm_");
-               BADCVAR("bot_prefix");
-               BADCVAR("bot_suffix");
+               BADPREFIX("crypto_");
+               BADPREFIX("g_chat_");
+               BADPREFIX("sv_fragmessage_");
+               BADPREFIX("sv_vote_");
+               BADPREFIX("timelimit_");
 
                // allowed changes to server admins (please sync this to server.cfg)
                // vi commands:
+               //   :/"impure"/,$d
                //   :g!,^\/\/[^ /],d
                //   :%s,//\([^ ]*\).*,BADCVAR("\1");,
                //   :%!sort
@@ -355,18 +369,14 @@ void cvar_changes_init()
                BADCVAR("g_balance_teams_force");
                BADCVAR("g_ban_sync_trusted_servers");
                BADCVAR("g_ban_sync_uri");
-               BADCVAR("g_cloaked");
                BADCVAR("g_ctf_capture_limit");
                BADCVAR("g_ctf_ignore_frags");
                BADCVAR("g_ctf_win_mode");
                BADCVAR("g_domination_point_limit");
-               BADCVAR("g_footsteps");
                BADCVAR("g_fullbrightitems");
                BADCVAR("g_fullbrightplayers");
-               BADCVAR("g_grappling_hook");
                BADCVAR("g_keyhunt_point_limit");
                BADCVAR("g_keyhunt_teams_override");
-               BADCVAR("g_laserguided_missile");
                BADCVAR("g_lms_lives_override");
                BADCVAR("g_maplist");
                BADCVAR("g_maplist_check_waypoints");
@@ -376,13 +386,9 @@ void cvar_changes_init()
                BADCVAR("g_maplist_votable_abstain");
                BADCVAR("g_maplist_votable_nodetail");
                BADCVAR("g_maplist_votable_suggestions");
-               BADCVAR("g_midair");
-               BADCVAR("g_minstagib");
                BADCVAR("g_nexball_goallimit");
-               BADCVAR("g_nixnex");
-               BADCVAR("g_nixnex_with_laser");
                BADCVAR("g_runematch_point_limit");
-               BADCVAR("g_vampire");
+               BADCVAR("g_start_delay");
                BADCVAR("hostname");
                BADCVAR("log_file");
                BADCVAR("maxplayers");
@@ -398,8 +404,8 @@ void cvar_changes_init()
                BADCVAR("sv_defaultcharacter");
                BADCVAR("sv_defaultplayermodel");
                BADCVAR("sv_defaultplayerskin");
-               BADCVAR("sv_gravity");
                BADCVAR("sv_maxrate");
+               BADCVAR("sv_maxidle");
                BADCVAR("sv_motd");
                BADCVAR("sv_public");
                BADCVAR("sv_ready_restart");
@@ -815,6 +821,8 @@ void spawnfunc_worldspawn (void)
        {
                records_reply[i] = strzone(getrecords(i));
        }
+       if(g_cts)
+               ladder_reply = strzone(getladder());
 
        rankings_reply = strzone(getrankings());