X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_world.qc;h=b1246091bcb1a1ca3d1f21477b32817f71e4a1bb;hp=f6eaace3de622e8916b47d783c26603b02938ea4;hb=0f6c4bee8db75b0aded48382af1c2693b19624de;hpb=ff024dad9985f1adf868547dbbcefdcaadbe9d1c

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index f6eaace3d..b1246091b 100644
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -19,6 +19,7 @@
 #include "teamplay.qh"
 #include "weapons/weaponstats.qh"
 #include "../common/constants.qh"
+#include <common/net_linked.qh>
 #include "../common/deathtypes/all.qh"
 #include "../common/mapinfo.qh"
 #include "../common/monsters/_mod.qh"
@@ -320,17 +321,20 @@ void cvar_changes_init()
 		BADCVAR("g_invasion_point_limit");
 		BADCVAR("g_keyhunt_point_leadlimit");
 		BADCVAR("g_nexball_goalleadlimit");
+		BADCVAR("g_new_toys_use_pickupsound");
+		BADCVAR("g_physics_predictall");
+		BADCVAR("g_piggyback");
 		BADCVAR("g_tdm_point_leadlimit");
 		BADCVAR("g_tdm_point_limit");
 		BADCVAR("leadlimit_and_fraglimit");
 		BADCVAR("leadlimit_override");
 		BADCVAR("pausable");
-		BADCVAR("sv_allow_fullbright");
 		BADCVAR("sv_checkforpacketsduringsleep");
 		BADCVAR("sv_intermission_cdtrack");
 		BADCVAR("sv_minigames");
 		BADCVAR("sv_namechangetimer");
 		BADCVAR("sv_precacheplayermodels");
+		BADCVAR("sv_stepheight");
 		BADCVAR("sv_timeout");
 		BADPREFIX("crypto_");
 		BADPREFIX("gameversion_");
@@ -342,9 +346,11 @@ void cvar_changes_init()
 		BADPREFIX("net_");
 		BADPREFIX("prvm_");
 		BADPREFIX("skill_");
+		BADPREFIX("sv_allow_");
 		BADPREFIX("sv_cullentities_");
 		BADPREFIX("sv_maxidle_");
 		BADPREFIX("sv_minigames_");
+		BADPREFIX("sv_radio_");
 		BADPREFIX("sv_timeout_");
 		BADPREFIX("sv_vote_");
 		BADPREFIX("timelimit_");
@@ -369,6 +375,7 @@ void cvar_changes_init()
 		BADCVAR("g_balance_teams_scorefactor");
 		BADCVAR("g_ban_sync_trusted_servers");
 		BADCVAR("g_ban_sync_uri");
+		BADCVAR("g_buffs");
 		BADCVAR("g_ca_teams_override");
 		BADCVAR("g_ctf_ignore_frags");
 		BADCVAR("g_domination_point_limit");
@@ -391,6 +398,8 @@ void cvar_changes_init()
 		BADCVAR("g_maxplayers");
 		BADCVAR("g_mirrordamage");
 		BADCVAR("g_nexball_goallimit");
+		BADCVAR("g_norecoil");
+		BADCVAR("g_physics_clientselect");
 		BADCVAR("g_powerups");
 		BADCVAR("g_spawnshieldtime");
 		BADCVAR("g_start_delay");
@@ -443,6 +452,7 @@ void cvar_changes_init()
 		BADCVAR("g_grappling_hook");
 		BADCVAR("g_jetpack");
 
+#undef BADPRESUFFIX
 #undef BADPREFIX
 #undef BADCVAR
 
@@ -908,7 +918,8 @@ spawnfunc(worldspawn)
 	if(cvar_string("g_mod_config") != cvar_defstring("g_mod_config"))
 		modname = cvar_string("g_mod_config");
 	// extra mutators that deserve to count as mod
-	MUTATOR_CALLHOOK(SetModname);
+	MUTATOR_CALLHOOK(SetModname, modname);
+	modname = M_ARGV(0, string);
 
 	// save it for later
 	modname = strzone(modname);
@@ -1499,7 +1510,7 @@ void FixIntermissionClient(entity e)
 			stuffcmd(e, "\nscr_printspeed 1000000\n");
 			RandomSelection_Init();
 			FOREACH_WORD(autocvar_sv_intermission_cdtrack, true, LAMBDA(
-				RandomSelection_Add(NULL, 0, it, 1, 1);
+				RandomSelection_AddString(it, 1, 1);
 			));
 			if (RandomSelection_chosen_string != "")
 			{
@@ -2077,10 +2088,6 @@ void EndFrame()
 	{
 		antilag_record(it, it, altime);
 	});
-	FOREACH_CLIENT(PS(it), {
-		PlayerState s = PS(it);
-		s.ps_push(s, it);
-	});
 	systems_update();
 	IL_ENDFRAME();
 }