X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_world.qc;h=7eda0103c4c9583c6f39e2dd993d7a75cf5d8264;hb=4626abb5835aa634be556b43361c20ea6481be6f;hp=b049972b564ac18c89d7458e46ea10cbe234ff22;hpb=be5a823f20ae87084f1e4f5ea9cfd69577bc7ba0;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index b049972b5..7eda0103c 100644
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -215,7 +215,6 @@ void cvar_changes_init()
 		// private
 		BADCVAR("developer");
 		BADCVAR("log_dest_udp");
-		BADCVAR("log_file");
 		BADCVAR("net_address");
 		BADCVAR("net_address_ipv6");
 		BADCVAR("port");
@@ -236,6 +235,7 @@ void cvar_changes_init()
 		BADPREFIX("g_playerstats_");
 		BADPREFIX("g_respawn_ghosts");
 		BADPREFIX("g_voice_flood_");
+		BADPREFIX("log_file");
 		BADPREFIX("rcon_");
 		BADPREFIX("sv_allowdownloads");
 		BADPREFIX("sv_autodemo");
@@ -420,7 +420,7 @@ void cvar_changes_init()
 		BADPREFIX("sv_ready_restart_");
 
 		// mutators that announce themselves properly to the server browser
-		BADCVAR("g_minstagib");
+		BADCVAR("g_instagib");
 		BADCVAR("g_new_toys");
 		BADCVAR("g_nix");
 		BADCVAR("g_grappling_hook");
@@ -786,7 +786,7 @@ 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_DAMAGE_DEALT_TOTAL, AS_INT, damage_dealt_total);
 	addstat(STAT_TYPEHIT_TIME, AS_FLOAT, typehit_time);
 	addstat(STAT_LAYED_MINES, AS_INT, minelayer_mines);
 
@@ -795,6 +795,10 @@ void spawnfunc_worldspawn (void)
 
 	addstat(STAT_HAGAR_LOAD, AS_INT, hagar_load);
 
+	// freeze attacks
+	addstat(STAT_FROZEN, AS_INT, frozen);
+	addstat(STAT_REVIVE_PROGRESS, AS_FLOAT, revive_progress);
+
 	// g_movementspeed hack
 	addstat(STAT_MOVEVARS_AIRSPEEDLIMIT_NONQW, AS_FLOAT, stat_sv_airspeedlimit_nonqw);
 	addstat(STAT_MOVEVARS_MAXSPEED, AS_FLOAT, stat_sv_maxspeed);
@@ -2232,19 +2236,21 @@ void EndFrame()
 	float altime;
 	FOR_EACH_REALCLIENT(self)
 	{
+		self.damage_dealt_total = 0;
+	
 		if(IS_SPEC(self))
 		{
 			if(self.enemy.typehitsound)
 				self.typehit_time = time;
-			else if(self.enemy.hitsound)
-				self.hit_time = time;
+			else if(self.enemy.damage_dealt)
+				self.damage_dealt_total = ceil(self.enemy.damage_dealt);
 		}
 		else
 		{
 			if(self.typehitsound)
 				self.typehit_time = time;
-			else if(self.hitsound)
-				self.hit_time = time;
+			else if(self.damage_dealt)
+				self.damage_dealt_total = ceil(self.damage_dealt);
 		}
 	}
 	altime = time + frametime * (1 + autocvar_g_antilag_nudge);
@@ -2255,10 +2261,12 @@ void EndFrame()
 	// needed!
 	FOR_EACH_CLIENT(self)
 	{
-		self.hitsound = FALSE;
 		self.typehitsound = FALSE;
+		self.damage_dealt = 0;
 		antilag_record(self, altime);
 	}
+	FOR_EACH_MONSTER(self)
+		antilag_record(self, altime);
 }