X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_world.qc;h=c45ad96e298d3a379dbd5b7c6bf4ec0a2253435b;hb=88e4782bf4efb1f8e7e6e722194f257c0daf8a01;hp=9888fa5d52a34ba00365003f32f4134c235542c4;hpb=d499d939ae90734c284c85058612aebbd0e5f273;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index 9888fa5d5..c45ad96e2 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_");
@@ -437,6 +441,7 @@ void cvar_changes_init()
 		BADCVAR("hostname");
 		BADCVAR("log_file");
 		BADCVAR("maxplayers");
+		BADCVAR("g_maxplayers");
 		BADCVAR("minplayers");
 		BADCVAR("net_address");
 		BADCVAR("port");
@@ -821,6 +826,9 @@ void spawnfunc_worldspawn (void)
 	addstat(STAT_WEAPON_CLIPLOAD, AS_INT, clip_load);
 	addstat(STAT_WEAPON_CLIPSIZE, AS_INT, clip_size);
 	addstat(STAT_LAST_PICKUP, AS_FLOAT, last_pickup);
+	addstat(STAT_HIT_TIME, AS_FLOAT, hit_time);
+	addstat(STAT_TYPEHIT_TIME, AS_FLOAT, typehit_time);
+	addstat(STAT_LAYED_MINES, AS_INT, minelayer_mines);
 
 	addstat(STAT_NEX_CHARGE, AS_FLOAT, nex_charge);
 	addstat(STAT_NEX_CHARGEPOOL, AS_FLOAT, nex_chargepool_ammo);
@@ -1429,7 +1437,6 @@ void DumpStats(float final)
 	float to_eventlog;
 	float to_file;
 	float i;
-	entity e;
 
 	to_console = autocvar_sv_logscores_console;
 	to_eventlog = autocvar_sv_eventlog;
@@ -2836,16 +2843,16 @@ void EndFrame()
 		if(self.classname == "spectator")
 		{
 			if(self.enemy.typehitsound)
-				play2(self, "misc/typehit.wav");
-			else if(self.enemy.hitsound && self.cvar_cl_hitsound)
-				play2(self, "misc/hit.wav");
+				self.typehit_time = time;
+			else if(self.enemy.hitsound)
+				self.hit_time = time;
 		}
 		else
 		{
 			if(self.typehitsound)
-				play2(self, "misc/typehit.wav");
-			else if(self.hitsound && self.cvar_cl_hitsound)
-				play2(self, "misc/hit.wav");
+				self.typehit_time = time;
+			else if(self.hitsound)
+				self.hit_time = time;
 		}
 	}
 	altime = time + frametime * (1 + autocvar_g_antilag_nudge);