eater -> predator, because that's a more correct word

[voretournament/voretournament.git] / data / qcsrc / server / g_world.qc

diff --git a/data/qcsrc/server/g_world.qc b/data/qcsrc/server/g_world.qc
index 024281035a44922112443e039577fafe7d287c56..e3e225e0464900fbb78376205001fbda362a3cca 100644 (file)
--- a/data/qcsrc/server/g_world.qc
+++ b/data/qcsrc/server/g_world.qc
@@ -49,13 +49,13 @@ void OtherPLReport_Think()
        WriteByte(MSG_BROADCAST, SVC_TEMPENTITY);\r
        WriteByte(MSG_BROADCAST, TE_CSQC_OTHERPLREPORT);\r
        WriteByte(MSG_BROADCAST, self.cnt);\r
-       if(e.eater.classname == "player") // tempt hackers less by only sending the info of eaten players\r
+       if(e.predator.classname == "player") // tempt hackers less by only sending the info of eaten players\r
        {\r
                if(cvar("g_vore_showpreyhealth"))\r
                        WriteByte(MSG_BROADCAST, e.health);\r
                else\r
                        WriteByte(MSG_BROADCAST, 0);\r
-               WriteByte(MSG_BROADCAST, num_for_edict(e.eater));\r
+               WriteByte(MSG_BROADCAST, num_for_edict(e.predator));\r
        }\r
        else\r
        {\r
@@ -654,10 +654,10 @@ void spawnfunc_worldspawn (void)
        addstat(STAT_DAMAGE_FIRED, AS_INT, stat_fired);\r
        addstat(STAT_SHOTORG, AS_INT, stat_shotorg);\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, stat_digesting);\r
-       addstat(STAT_STOMACH_EATEN, AS_INT, stat_eaten);\r
+       addstat(STAT_VORE_LOAD, AS_INT, stat_stomachload);\r
+       addstat(STAT_VORE_DIGESTING, AS_INT, stat_digesting);\r
+       addstat(STAT_VORE_EATEN, AS_INT, stat_eaten);\r
+       addstat(STAT_VORE_CANLEAVE, AS_INT, stat_canleave);\r
 \r
        next_pingtime = time + 5;\r
        InitializeEntity(self, cvar_changes_init, INITPRIO_CVARS);\r
@@ -1157,7 +1157,7 @@ void IntermissionThink()
                return;\r
 \r
        if(!mapvote_initialized)\r
-               if (time < intermission_exittime + 10 && !self.BUTTON_ATCK && !self.BUTTON_JUMP && !self.BUTTON_ATCK2 && !self.BUTTON_GRABBER && !self.BUTTON_USE)\r
+               if (time < intermission_exittime + 10 && !self.BUTTON_ATCK && !self.BUTTON_JUMP && !self.BUTTON_ATCK2 && !self.BUTTON_JETPACK && !self.BUTTON_USE)\r
                        return;\r
 \r
        MapVote_Start();\r