Prey stealing system. When enabled, eating someone who already has someone in their...

diff --git a/Todo & known bugs.txt b/Todo & known bugs.txt
index 25c10a55ac22d2852c4a76c787ca241b86db2772..e2dde4793d40b1ba9b475c9e86710a1a1f47c957 100644 (file)
--- a/Todo & known bugs.txt
+++ b/Todo & known bugs.txt
@@ -6,8 +6,6 @@ Todo:
 \r
 - Bots must learn to use the Grabber gun. The weapon code of havocbot is still there, but doesn't know how to shoot the Grabber\r
 \r
-- Add a feature that allows predators to steal the prey from their preys stomach instead of squeezing it out. So if you eat someone who already has someone in them, put that someone in you with the prey it was in. Should be cvared and disabled by default, but can be a random chance\r
-\r
 Known bugs:\r
 \r
 - Prey bots don't kick in the stomach in Arena and Clan Arena gametypes\r

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index e6cb21e4b3d54f27883241c5019afc526655bebc..b1b13558a9bd5fb1c077e22d58a67b7f84aa96f8 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -357,7 +357,20 @@ void Vore()
        if(self.eater.deadflag || self.deadflag)\r
                Vore_Regurgitate(self);\r
        else if(self.eater.eater.classname == "player") // don't allow a player inside a player inside another player :)\r
+       {\r
+               entity targeteater, oldself;\r
+               targeteater = self.eater.eater;\r
+\r
                Vore_Regurgitate(self);\r
+               if(1 == 1) //cvar!!!!!!!!!!!!!!!!\r
+               if(Swallow_condition_check(self))\r
+               {\r
+                       oldself = self;\r
+                       self = targeteater;\r
+                       Vore_Swallow(oldself);\r
+                       self = oldself;\r
+               }\r
+       }\r
        else if(vlen(self.eater.velocity) > cvar("g_balance_vore_regurgitate_velocitylimit"))\r
                Vore_Regurgitate(self);\r
 \r