X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=data%2Fqcsrc%2Fserver%2Fg_world.qc;h=93a16bdd98c9b75bc714caacb553087c850c872f;hb=cc045f9d09b57e3ce32ee45f807b18438e410380;hp=7a065d43dc6c056c5e2b1d96d9c1ceb5e9d0f83c;hpb=7d99fb180b0b154a56021205d267fb410038c837;p=voretournament%2Fvoretournament.git

diff --git a/data/qcsrc/server/g_world.qc b/data/qcsrc/server/g_world.qc
index 7a065d43..93a16bdd 100644
--- a/data/qcsrc/server/g_world.qc
+++ b/data/qcsrc/server/g_world.qc
@@ -49,17 +49,17 @@ 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);
+			WriteShort(MSG_BROADCAST, e.health); // not WriteByte because we show minus health too
 		else
-			WriteByte(MSG_BROADCAST, 0);
+			WriteShort(MSG_BROADCAST, 0);
 		WriteByte(MSG_BROADCAST, num_for_edict(e.predator));
 	}
 	else
 	{
-		WriteByte(MSG_BROADCAST, 0);
+		WriteShort(MSG_BROADCAST, 0);
 		WriteByte(MSG_BROADCAST, 0);
 	}
 	self.cnt = mod(self.cnt + 1, maxclients);
@@ -659,11 +659,19 @@ void spawnfunc_worldspawn (void)
 	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_MAXLOAD, AS_INT, stat_stomachmaxload);
 	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_VORE_PROGRESS_PREY, AS_FLOAT, swallow_progress_prey);
+	addstat(STAT_VORE_PROGRESS_PRED, AS_FLOAT, swallow_progress_pred);
+	addstat(STAT_CROSSHAIR_STYLE, AS_INT, stat_crosshair_style);
+	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);
+	addstat(STAT_RESPAWN_TIME, AS_FLOAT, stat_respawn_time);
 	next_pingtime = time + 5;
 	InitializeEntity(self, cvar_changes_init, INITPRIO_CVARS);