X-Git-Url: https://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=blobdiff_plain;f=data%2Fqcsrc%2Fserver%2Fvore.qc;h=bb35b189cef495b052952417ac3ffc6ce76d2012;hp=268798a0c11fad9af8803a7360e0394876df267f;hb=829dd8207468230c9ce035a8c5622af026e932bb;hpb=d4f082640c5df19a5e3aa01b0326870d07820e2f

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 268798a0..bb35b189 100644
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -80,7 +80,6 @@ void Vore_Swallow(entity e)
 	e.alpha = -1; // best way of hiding / showing the eaten player
 	e.aiment = e.eater; // follow the predator. Is automatically unset
 	e.view_ofs_z /= 2; // best positioning for the stomach model
-	e.stat_eaten = num_for_edict(e.eater);
 
 	// drop keys (KH) and flags (CTF) when we get swallowed
 	kh_Key_DropAll(e, FALSE);
@@ -107,7 +106,6 @@ void Vore_Regurgitate(entity e)
 		e.solid = e.vore_oldsolid;
 	e.alpha = default_player_alpha; // best way of hiding / showing the eaten player
 	e.view_ofs_z *= 2; // best positioning for the stomach model
-	e.stat_eaten = 0;
 
 	// velocities
 	local vector oldforward, oldright, oldup;
@@ -141,7 +139,6 @@ void Vore_Disconnect()
 	if(self.eater.classname == "player")
 	{
 		self.view_ofs_z += 25;
-		self.stat_eaten = 0;
 		self.eater.stomach_load -= 1;
 		Vore_Weight_apply(self.eater);
 		self.eater = world;
@@ -238,10 +235,16 @@ void Vore_Gurglesound()
 void Vore()
 {
 	// if we are free, show our stomach load on the HUD. Otherwise, show the predator's
-	if(self.eater.classname == "player")
+	if(self.eater != self && self.eater.classname == "player")
+	{
 		self.stat_stomachload = self.eater.stomach_load;
+		self.stat_eaten = num_for_edict(self.eater);
+	}
 	else
+	{
 		self.stat_stomachload = self.stomach_load;
+		self.stat_eaten = 0;
+	}
 
 	// skip the vore system under some circumstances
 	if(time < game_starttime)