Show digestion of the predator too

diff --git a/data/qcsrc/server/defs.qh b/data/qcsrc/server/defs.qh
index 0ef4fb36bb8509dc5bae2946aa39b4dd20a67926..440c0a2d4e1ce270be4706345797dc7017494d19 100644 (file)
--- a/data/qcsrc/server/defs.qh
+++ b/data/qcsrc/server/defs.qh
@@ -69,7 +69,7 @@ float maxclients;
 .float digesting;\r
 .float stomach_load;\r
 .float weapon_delay;\r
 .float digesting;\r
 .float stomach_load;\r
 .float weapon_delay;\r

-.float stat_eaten, stat_stomachload;\r
+.float stat_eaten, stat_stomachload, stat_digesting;\r

 \r
 // Fields\r
 \r
 \r
 // Fields\r
 \r

diff --git a/data/qcsrc/server/g_world.qc b/data/qcsrc/server/g_world.qc
index aae78b32a5abc6a05521073bb538097bf4c0407b..024281035a44922112443e039577fafe7d287c56 100644 (file)
--- 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);\r
        addstat(STAT_BULLETS_LOADED, AS_INT, campingrifle_bulletcounter);\r
        addstat(STAT_STOMACH_LOAD, AS_INT, stat_stomachload);\r
        addstat(STAT_LEADLIMIT, AS_FLOAT, stat_leadlimit);\r
        addstat(STAT_BULLETS_LOADED, AS_INT, campingrifle_bulletcounter);\r
        addstat(STAT_STOMACH_LOAD, AS_INT, stat_stomachload);\r

-       addstat(STAT_STOMACH_DIGESTING, AS_INT, digesting);\r
+       addstat(STAT_STOMACH_DIGESTING, AS_INT, stat_digesting);\r

        addstat(STAT_STOMACH_EATEN, AS_INT, stat_eaten);\r
 \r
        next_pingtime = time + 5;\r
        addstat(STAT_STOMACH_EATEN, AS_INT, stat_eaten);\r
 \r
        next_pingtime = time + 5;\r

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index bb35b189cef495b052952417ac3ffc6ce76d2012..3a7982db82dddd0393b31c0851c3dc3faa9d4fbc 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -235,14 +235,16 @@ void Vore_Gurglesound()
 void Vore()\r
 {\r
        // if we are free, show our stomach load on the HUD. Otherwise, show the predator's\r
 void Vore()\r
 {\r
        // if we are free, show our stomach load on the HUD. Otherwise, show the predator's\r

-       if(self.eater != self && self.eater.classname == "player")\r
+       if(self.eater.classname == "player")\r

        {\r
                self.stat_stomachload = self.eater.stomach_load;\r
        {\r
                self.stat_stomachload = self.eater.stomach_load;\r

+               self.stat_digesting = self.eater.digesting;\r

                self.stat_eaten = num_for_edict(self.eater);\r
        }\r
        else\r
        {\r
                self.stat_stomachload = self.stomach_load;\r
                self.stat_eaten = num_for_edict(self.eater);\r
        }\r
        else\r
        {\r
                self.stat_stomachload = self.stomach_load;\r

+               self.stat_digesting = self.digesting;\r

                self.stat_eaten = 0;\r
        }\r
 \r
                self.stat_eaten = 0;\r
        }\r
 \r