Fix a bug causing regurgitation to loop if holding the regurgitate button down. Mainl...

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 50f0e43ff982a8f6c4327436e127542101a13fc2..464afe503b6966e736aa3a0640fadc8deaee8115 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -790,6 +790,7 @@ void Vore()
 \r
        // predator wishes to regurgitate his prey\r
        if(self.BUTTON_REGURGITATE && time > self.action_delay)\r
 \r
        // predator wishes to regurgitate his prey\r
        if(self.BUTTON_REGURGITATE && time > self.action_delay)\r

+       if(!self.regurgitate_prepare)\r

        {\r
                if(self.stomach_load)\r
                {\r
        {\r
                if(self.stomach_load)\r
                {\r


@@ -862,9 +863,8 @@ void Vore()
        // apply delayed regurgitating if it was scheduled\r
        if(self.predator.regurgitate_prepare && time > self.predator.regurgitate_prepare)\r
        {\r
        // apply delayed regurgitating if it was scheduled\r
        if(self.predator.regurgitate_prepare && time > self.predator.regurgitate_prepare)\r
        {\r

-               self.predator.regurgitate_prepare = 0;\r
-               self.predator.complain_vore = time + complain_delay_time; // prevent complaining the next frame if this empties our stomach\r

                Vore_Regurgitate(self);\r
                Vore_Regurgitate(self);\r

+               self.predator.complain_vore = time + complain_delay_time; // prevent complaining the next frame if this empties our stomach\r

        }\r
 \r
        // execute digesting and team healing\r
        }\r
 \r
        // execute digesting and team healing\r

diff --git a/docs/Release notes.txt b/docs/Release notes.txt
index 69050befde59f88d03278d93f25eb6fe27ae2715..fb50b5c70f90c84024a91a679e8e445b4821ea91 100644 (file)
--- a/docs/Release notes.txt
+++ b/docs/Release notes.txt
@@ -270,6 +270,8 @@ Bug fixes:
 \r
 - Fix a few divisions by 0, specifically those that would take place constantly.\r
 \r
 \r
 - Fix a few divisions by 0, specifically those that would take place constantly.\r
 \r

+- Holding the Regurgitate button down would cause the process to loop infinitely, which could also cause bots to get stuck trying to throw up.\r
+\r

 Features:\r
 \r
 - There is no longer a player swallow limit. Players have a stomach capacity (for predators) and a mass (for prey), both based on player scale. As long as your mass is not exceeded, you can keep swallowing players. This affects your weight and overall player capacity based on player size as well. eg: You might be able to eat only one large player, three tiny players, or two normal sized players at the same time. Stomach size will also reflect your capacity, not the player count, being bigger or smaller based on the prey inside and their size compared to yours. By default, a macro can swallow up to 15 mircos and a micro up to 1 macro.\r
 Features:\r
 \r
 - There is no longer a player swallow limit. Players have a stomach capacity (for predators) and a mass (for prey), both based on player scale. As long as your mass is not exceeded, you can keep swallowing players. This affects your weight and overall player capacity based on player size as well. eg: You might be able to eat only one large player, three tiny players, or two normal sized players at the same time. Stomach size will also reflect your capacity, not the player count, being bigger or smaller based on the prey inside and their size compared to yours. By default, a macro can swallow up to 15 mircos and a micro up to 1 macro.\r

diff --git a/docs/TODO.txt b/docs/TODO.txt
index 4e232b361fb8d5ecd1dc21a75fad145ea5cfe647..3432e10f8669c481a3df0304aa2e5af4bfad4e52 100644 (file)
--- a/docs/TODO.txt
+++ b/docs/TODO.txt
@@ -114,8 +114,6 @@
 \r
 - 0.7 | 0.8: Maybe find better footstep sounds?\r
 \r
 \r
 - 0.7 | 0.8: Maybe find better footstep sounds?\r
 \r

-- 0.7 | 0.8: Bots get stuck with eaten items sometimes.\r
-\r

 - 0.7 | 0.8 BUG: Gibbed dead bodies seem to keep throwing gibs infinitely on dedicated servers.\r
 \r
 - 0.8: Chat portraits for all models.\r
 - 0.7 | 0.8 BUG: Gibbed dead bodies seem to keep throwing gibs infinitely on dedicated servers.\r
 \r
 - 0.8: Chat portraits for all models.\r


@@ -123,3 +121,9 @@
 - +0.8: Fix flying spectators not going through teleporters and warpzones. Very hard, since they're FLY_WORLDONLY and can't touch triggers\r
 \r
 - 0.7: Randomize all punchangles.\r
 - +0.8: Fix flying spectators not going through teleporters and warpzones. Very hard, since they're FLY_WORLDONLY and can't touch triggers\r
 \r
 - 0.7: Randomize all punchangles.\r

+\r
+- 0.7 | 0.8: Enable r_shadows in some way?\r
+\r
+- 0.7 BUG: Flying spectators cause impact particles. Don't!\r
+\r
+- 0.7 | 0.8: Dim screen while swallowing or being swallowed.\r