Fix a big issue in the new tick check for prey. The vore system works properly again

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

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index d1069129fbae3dd6f34eee829562f92ac09625b3..798b5cf6d2c9366f070ee128f1615a25c678dfe9 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -1,3 +1,4 @@
+.float vore_frametime;\r
 .float regurgitate_prepare;\r
 .float stomachkick_delay, system_delay, action_delay, digest_button_delay_time, regurgitate_button_delay_time;\r
 .float complain_vore;\r
@@ -659,6 +660,7 @@ void Vore_SetSbarRings()
        }\r
 }\r
 \r
+.entity prey;\r
 void Vore()\r
 {\r
        // main vore code, this is where it all happens\r
@@ -761,23 +763,27 @@ void Vore()
 // Code that addresses predators:\r
 // --------------------------------\r
 \r
-       entity prey;\r
-       prey = Swallow_player_check();\r
+       // only scan prey each server frame, else we get major breakage in multiplayer\r
+       if(self.vore_frametime <= time)\r
+       {\r
+               self.prey = Swallow_player_check();\r
+               self.vore_frametime = time + sys_frametime;\r
+       }\r
 \r
        // attempt to swallow our new prey if we pressed the attack button, and there's any in range\r
        self.stat_canswallow = 0;\r
-       if(Swallow_condition_check(prey))\r
+       if(Swallow_condition_check(self.prey))\r
        {\r
                // canswallow stat, used by the HUD\r
-               if(teams_matter && prey.team == self.team)\r
+               if(teams_matter && self.prey.team == self.team)\r
                        self.stat_canswallow = 2;\r
                else\r
                        self.stat_canswallow = 1;\r
 \r
                if(self.BUTTON_ATCK)\r
-                       Vore_SwallowStep(prey);\r
+                       Vore_SwallowStep(self.prey);\r
        }\r
-       else if(prey != world)\r
+       else if(self.prey != world)\r
                self.stat_canswallow = -1;\r
 \r
        // toggle digestion, if the player has someone in their stomach\r