X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_world.qc;h=996b89b45add77861b00f6590328e84adc3ee700;hp=a5192b13c47d1220014801152950f58cdf246a90;hb=94db0bdbb20203c5675c8e6f1ab3bdf6a105b20f;hpb=8fcb8c412f42cbdee7f85162f45424880a591682

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index a5192b13c..996b89b45 100644
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -237,6 +237,10 @@ void cvar_changes_init()
 #define BADPREFIX(p) if(substring(k, 0, strlen(p)) == p) continue
 #define BADPRESUFFIX(p,s) if(substring(k, 0, strlen(p)) == p && substring(k, -strlen(s), -1) == s) continue
 #define BADCVAR(p) if(k == p) continue
+
+		// general excludes and namespaces for server admin used cvars
+		BADPREFIX("help_"); // PN's server has this listed as changed, let's not rat him out for THAT
+
 		// internal
 		BADPREFIX("csqc_");
 		BADPREFIX("cvar_check_");
@@ -311,30 +315,32 @@ void cvar_changes_init()
 		BADCVAR("g_forced_team_pink");
 
 		// mapinfo
-		BADCVAR("timelimit");
 		BADCVAR("fraglimit");
-		BADCVAR("leadlimit");
-		BADCVAR("g_tdm_teams");
-		BADCVAR("g_keyhunt_teams");
-		BADCVAR("g_domination_default_teams");
-		BADCVAR("g_race_qualifying_timelimit");
-		BADCVAR("g_lms");
 		BADCVAR("g_arena");
-		BADCVAR("g_ca");
 		BADCVAR("g_assault");
+		BADCVAR("g_ca");
 		BADCVAR("g_ctf");
+		BADCVAR("g_cts");
 		BADCVAR("g_dm");
 		BADCVAR("g_domination");
+		BADCVAR("g_domination_default_teams");
+		BADCVAR("g_freezetag");
+		BADCVAR("g_keepaway");
 		BADCVAR("g_keyhunt");
 		BADCVAR("g_keyhunt_teams");
+		BADCVAR("g_keyhunt_teams");
+		BADCVAR("g_lms");
+		BADCVAR("g_nexball");
 		BADCVAR("g_onslaught");
 		BADCVAR("g_race");
-		BADCVAR("g_cts");
+		BADCVAR("g_race_qualifying_timelimit");
 		BADCVAR("g_runematch");
 		BADCVAR("g_tdm");
-		BADCVAR("g_nexball");
-		BADCVAR("g_keepaway");
+		BADCVAR("g_tdm_teams");
+		BADCVAR("leadlimit");
+		BADCVAR("nextmap");
 		BADCVAR("teamplay");
+		BADCVAR("timelimit");
 
 		// long
 		BADCVAR("hostname");
@@ -362,22 +368,33 @@ void cvar_changes_init()
 		// does nothing visible
 		BADCVAR("captureleadlimit_override");
 		BADCVAR("g_arena_point_leadlimit");
+		BADCVAR("g_balance_kill_delay");
 		BADCVAR("g_ca_point_leadlimit");
+		BADCVAR("g_ctf_captimerecord_always");
 		BADCVAR("g_ctf_capture_leadlimit");
+		BADCVAR("g_ctf_flag_capture_effects");
+		BADCVAR("g_ctf_flag_glowtrails");
+		BADCVAR("g_ctf_flag_pickup_effects");
 		BADCVAR("g_domination_point_leadlimit");
+		BADCVAR("g_forced_respawn");
 		BADCVAR("g_keyhunt_point_leadlimit");
 		BADCVAR("g_nexball_goalleadlimit");
 		BADCVAR("g_runematch_point_leadlimit");
 		BADCVAR("leadlimit_and_fraglimit");
 		BADCVAR("leadlimit_override");
-		BADCVAR("sv_checkforpacketsduringsleep");
 		BADCVAR("pausable");
+		BADCVAR("sv_checkforpacketsduringsleep");
 		BADCVAR("sv_timeout");
+		BADCVAR("welcome_message_time");
 		BADPREFIX("crypto_");
 		BADPREFIX("g_chat_");
+		BADPREFIX("g_ctf_captimerecord_");
+		BADPREFIX("g_maplist_votable_");
 		BADPREFIX("net_");
 		BADPREFIX("prvm_");
+		BADPREFIX("skill_");
 		BADPREFIX("sv_fragmessage_");
+		BADPREFIX("sv_maxidle_");
 		BADPREFIX("sv_vote_");
 		BADPREFIX("timelimit_");
 
@@ -424,6 +441,7 @@ void cvar_changes_init()
 		BADCVAR("hostname");
 		BADCVAR("log_file");
 		BADCVAR("maxplayers");
+		BADCVAR("g_maxplayers");
 		BADCVAR("minplayers");
 		BADCVAR("net_address");
 		BADCVAR("port");
@@ -452,6 +470,9 @@ void cvar_changes_init()
 		BADCVAR("sv_vote_master_password");
 		BADCVAR("sv_vote_simple_majority_factor");
 		BADCVAR("timelimit_override");
+		BADCVAR("g_warmup");
+		BADPREFIX("g_warmup_");
+		BADCVAR("teamplay_mode");
 
 		if(autocvar_g_minstagib)
 		{
@@ -802,8 +823,9 @@ void spawnfunc_worldspawn (void)
 	addstat(STAT_FUEL, AS_INT, ammo_fuel);
 	addstat(STAT_SHOTORG, AS_INT, stat_shotorg);
 	addstat(STAT_LEADLIMIT, AS_FLOAT, stat_leadlimit);
-	addstat(STAT_BULLETS_LOADED, AS_INT, campingrifle_bulletcounter);
+	addstat(STAT_BULLETS_LOADED, AS_INT, sniperrifle_bulletcounter);
 	addstat(STAT_LAST_PICKUP, AS_FLOAT, last_pickup);
+	addstat(STAT_HIT_TIME, AS_FLOAT, hit_time);
 
 	addstat(STAT_NEX_CHARGE, AS_FLOAT, nex_charge);
 	addstat(STAT_NEX_CHARGEPOOL, AS_FLOAT, nex_chargepool_ammo);
@@ -1507,11 +1529,6 @@ void DumpStats(float final)
 		fputs(file, ":end\n");
 		fclose(file);
 	}
-
-	// send statistics
-	FOR_EACH_CLIENT(e)
-		PlayerStats_AddGlobalInfo(e);
-	PlayerStats_Shutdown();
 }
 
 void FixIntermissionClient(entity e)
@@ -1580,6 +1597,13 @@ void NextLevel()
 
 	DumpStats(TRUE);
 
+	// send statistics
+	entity e;
+	PlayerStats_EndMatch(1);
+	FOR_EACH_CLIENT(e)
+		PlayerStats_AddGlobalInfo(e);
+	PlayerStats_Shutdown();
+
 	if(autocvar_sv_eventlog)
 		GameLogEcho(":gameover");
 
@@ -2924,6 +2948,7 @@ void SV_Shutdown()
 		print("Saving persistent data...\n");
 		Ban_SaveBans();
 
+		PlayerStats_EndMatch(0);
 		FOR_EACH_CLIENT(e)
 			PlayerStats_AddGlobalInfo(e);
 		PlayerStats_Shutdown();