From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sun, 5 Sep 2010 01:06:06 +0000 (+0300)
Subject: Show digestion of the predator too
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=581d320e29b70e646c11196aaeb14316ea014305;p=voretournament%2Fvoretournament.git

Show digestion of the predator too
---

diff --git a/data/qcsrc/server/defs.qh b/data/qcsrc/server/defs.qh
index 0ef4fb36..440c0a2d 100644
--- a/data/qcsrc/server/defs.qh
+++ b/data/qcsrc/server/defs.qh
@@ -69,7 +69,7 @@ float maxclients;
 .float digesting;
 .float stomach_load;
 .float weapon_delay;
-.float stat_eaten, stat_stomachload;
+.float stat_eaten, stat_stomachload, stat_digesting;
 
 // Fields
 
diff --git a/data/qcsrc/server/g_world.qc b/data/qcsrc/server/g_world.qc
index aae78b32..02428103 100644
--- a/data/qcsrc/server/g_world.qc
+++ b/data/qcsrc/server/g_world.qc
@@ -656,7 +656,7 @@ void spawnfunc_worldspawn (void)
 	addstat(STAT_LEADLIMIT, AS_FLOAT, stat_leadlimit);
 	addstat(STAT_BULLETS_LOADED, AS_INT, campingrifle_bulletcounter);
 	addstat(STAT_STOMACH_LOAD, AS_INT, stat_stomachload);
-	addstat(STAT_STOMACH_DIGESTING, AS_INT, digesting);
+	addstat(STAT_STOMACH_DIGESTING, AS_INT, stat_digesting);
 	addstat(STAT_STOMACH_EATEN, AS_INT, stat_eaten);
 
 	next_pingtime = time + 5;
diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index bb35b189..3a7982db 100644
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -235,14 +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 != self && self.eater.classname == "player")
+	if(self.eater.classname == "player")
 	{
 		self.stat_stomachload = self.eater.stomach_load;
+		self.stat_digesting = self.eater.digesting;
 		self.stat_eaten = num_for_edict(self.eater);
 	}
 	else
 	{
 		self.stat_stomachload = self.stomach_load;
+		self.stat_digesting = self.digesting;
 		self.stat_eaten = 0;
 	}