X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_world.qc;h=9e9907e13a35acd7d6b5798256c4aed9e39659a0;hb=b4293658bf64d43e9f9233997ee6388b8526bc34;hp=c5abb52f592ed30d817fa21574035e64b9f7a207;hpb=ed9746e993857fb258c7148fe14559b57fa10709;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index c5abb52f5..9e9907e13 100644
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -272,7 +272,21 @@ void cvar_changes_init()
 		BADCVAR("bgmvolume");
 
 		// private
+		BADCVAR("developer");
+		BADCVAR("g_banned_list");
+		BADCVAR("log_dest_udp");
+		BADCVAR("log_file");
+		BADCVAR("net_address");
+		BADCVAR("net_address_ipv6");
+		BADCVAR("port");
+		BADCVAR("savedgamecfg");
 		BADCVAR("serverconfig");
+		BADCVAR("sv_heartbeatperiod");
+		BADCVAR("sv_vote_master_password");
+		BADCVAR("sys_colortranslation");
+		BADCVAR("sys_specialcharactertranslation");
+		BADCVAR("timestamps");
+		BADPREFIX("developer_");
 		BADPREFIX("g_ban_");
 		BADPREFIX("g_chat_flood_");
 		BADPREFIX("g_voice_flood_");
@@ -284,22 +298,13 @@ void cvar_changes_init()
 		BADPREFIX("sv_eventlog");
 		BADPREFIX("sv_logscores_");
 		BADPREFIX("sv_master");
-		BADCVAR("g_banned_list");
-		BADCVAR("log_dest_udp");
-		BADCVAR("log_file");
-		BADCVAR("net_address");
-		BADCVAR("port");
-		BADCVAR("savedgamecfg");
-		BADCVAR("sv_heartbeatperiod");
-		BADCVAR("sv_vote_master_password");
-		BADCVAR("sys_colortranslation");
-		BADCVAR("sys_specialcharactertranslation");
-		BADCVAR("timestamps");
-		BADCVAR("net_address");
-		BADCVAR("net_address_ipv6");
 		BADPREFIX("sv_weaponstats_");
-		BADCVAR("developer");
-		BADPREFIX("developer_");
+
+		// these can contain player IDs, so better hide
+		BADCVAR("g_forced_team_red");
+		BADCVAR("g_forced_team_blue");
+		BADCVAR("g_forced_team_yellow");
+		BADCVAR("g_forced_team_pink");
 
 		// mapinfo
 		BADCVAR("timelimit");
@@ -363,6 +368,7 @@ void cvar_changes_init()
 		BADCVAR("sv_checkforpacketsduringsleep");
 		BADPREFIX("crypto_");
 		BADPREFIX("g_chat_");
+		BADPREFIX("net_");
 		BADPREFIX("prvm_");
 		BADPREFIX("sv_fragmessage_");
 		BADPREFIX("sv_vote_");
@@ -437,6 +443,12 @@ void cvar_changes_init()
 		BADCVAR("sv_vote_master_password");
 		BADCVAR("sv_vote_simple_majority_factor");
 		BADCVAR("timelimit_override");
+
+		if(cvar("g_minstagib"))
+		{
+			BADCVAR("g_grappling_hook");
+			BADCVAR("g_jetpack");
+		}
 #undef BADPREFIX
 #undef BADCVAR
 
@@ -693,24 +705,34 @@ void spawnfunc_worldspawn (void)
 		MUTATOR_CALLHOOK(BuildMutatorsString);
 		s = ret_string;
 
+		// simple, probably not good in the mutator system
 		if(cvar("g_grappling_hook"))
 			s = strcat(s, ":grappling_hook");
+
+		// initialiation stuff, not good in the mutator system
 		if(!cvar("g_use_ammunition"))
 			s = strcat(s, ":no_use_ammunition");
+
+		// initialiation stuff, not good in the mutator system
 		if(!cvar("g_pickup_items"))
 			s = strcat(s, ":no_pickup_items");
+
+		// initialiation stuff, not good in the mutator system
 		if(cvar_string("g_weaponarena") != "0")
 			s = strcat(s, ":", cvar_string("g_weaponarena"), " arena");
-		if(cvar("g_vampire"))
-			s = strcat(s, ":vampire");
-		if(cvar("g_laserguided_missile"))
-			s = strcat(s, ":laserguided_missile");
+
+		// TODO to mutator system
 		if(cvar("g_norecoil"))
 			s = strcat(s, ":norecoil");
+
+		// TODO to mutator system
 		if(cvar("g_midair"))
 			s = strcat(s, ":midair");
+
+		// TODO to mutator system
 		if(cvar("g_minstagib"))
 			s = strcat(s, ":minstagib");
+
 		GameLogEcho(s);
 		GameLogEcho(":gameinfo:end");
 	}
@@ -786,6 +808,7 @@ void spawnfunc_worldspawn (void)
 	addstat(STAT_LAST_PICKUP, AS_FLOAT, last_pickup);
 
 	addstat(STAT_NEX_CHARGE, AS_FLOAT, nex_charge);
+	addstat(STAT_NEX_CHARGEPOOL, AS_FLOAT, nex_charge_pool_ammo);
 
 	if(g_ca)
 	{