X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=data%2Fqcsrc%2Fserver%2Fg_world.qc;h=ababcf9357ba377b5b54941352a20596caea085f;hb=fe42516e6a8f92a82685199abb2c6dcf6b3faeb0;hp=c34b4b5bfe2ee150c64322a738df96b89009af87;hpb=7896295d14b22c2b40ef9ef264c16f13ae24c725;p=voretournament%2Fvoretournament.git

diff --git a/data/qcsrc/server/g_world.qc b/data/qcsrc/server/g_world.qc
index c34b4b5b..ababcf93 100644
--- a/data/qcsrc/server/g_world.qc
+++ b/data/qcsrc/server/g_world.qc
@@ -49,7 +49,7 @@ void OtherPLReport_Think()
 	WriteByte(MSG_BROADCAST, SVC_TEMPENTITY);
 	WriteByte(MSG_BROADCAST, TE_CSQC_OTHERPLREPORT);
 	WriteByte(MSG_BROADCAST, self.cnt);
-	if(e.predator.classname == "player") // tempt hackers less by only sending the info of eaten players
+	if(e.stat_eaten) // tempt hackers less by only sending the info of eaten players
 	{
 		if(cvar("g_vore_showhealth"))
 			WriteByte(MSG_BROADCAST, e.health);
@@ -654,12 +654,19 @@ void spawnfunc_worldspawn (void)
 	addstat(STAT_DAMAGE_FIRED, AS_INT, stat_fired);
 	addstat(STAT_SHOTORG, AS_INT, stat_shotorg);
 	addstat(STAT_LEADLIMIT, AS_FLOAT, stat_leadlimit);
+	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_WINNING, AS_FLOAT, winning);
 	addstat(STAT_VORE_LOAD, AS_INT, stat_stomachload);
+	addstat(STAT_VORE_CANSWALLOW, AS_INT, stat_canswallow);
 	addstat(STAT_VORE_DIGESTING, AS_INT, stat_digesting);
 	addstat(STAT_VORE_EATEN, AS_INT, stat_eaten);
 	addstat(STAT_VORE_CANLEAVE, AS_INT, stat_canleave);
-
+	addstat(STAT_SBRING1_TYPE, AS_INT, stat_sbring1_type);
+	addstat(STAT_SBRING1_CLIP, AS_FLOAT, stat_sbring1_clip);
+	addstat(STAT_SBRING2_TYPE, AS_INT, stat_sbring2_type);
+	addstat(STAT_SBRING2_CLIP, AS_FLOAT, stat_sbring2_clip);
 	next_pingtime = time + 5;
 	InitializeEntity(self, cvar_changes_init, INITPRIO_CVARS);
 
@@ -1333,7 +1340,6 @@ void DumpStats(float final)
 
 void FixIntermissionClient(entity e)
 {
-	string s;
 	if(!e.autoscreenshot) // initial call
 	{
 		e.angles = e.v_angle;
@@ -1353,12 +1359,6 @@ void FixIntermissionClient(entity e)
 		if(clienttype(e) == CLIENTTYPE_REAL)
 		{
 			stuffcmd(e, "\nscr_printspeed 1000000\n");
-			if(e.winning)
-				s = cvar_string("sv_intermission_cdtrack_win");
-			else
-				s = cvar_string("sv_intermission_cdtrack_loose");
-			if(s != "")
-				stuffcmd(e, strcat("\ncd loop ", s, "\n"));
 			msg_entity = e;
 			WriteByte(MSG_ONE, SVC_INTERMISSION);
 		}