From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Mon, 6 Sep 2010 18:17:29 +0000 (+0300)
Subject: Prey stealing system. When enabled, eating someone who already has someone in their... 
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d433e67740b2b1d6796dd235bca965b25c1b238f;p=voretournament%2Fvoretournament.git

Prey stealing system. When enabled, eating someone who already has someone in their stomach will automatically get them in your stomach too. In other words, prey joins its previous predator in your stomach, when that predator gets eaten by you.
---

diff --git a/Todo & known bugs.txt b/Todo & known bugs.txt
index 25c10a55..e2dde479 100644
--- a/Todo & known bugs.txt	
+++ b/Todo & known bugs.txt	
@@ -6,8 +6,6 @@ Todo:
 
 - 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
 
-- 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
-
 Known bugs:
 
 - Prey bots don't kick in the stomach in Arena and Clan Arena gametypes
diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index e6cb21e4..b1b13558 100644
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -357,7 +357,20 @@ void Vore()
 	if(self.eater.deadflag || self.deadflag)
 		Vore_Regurgitate(self);
 	else if(self.eater.eater.classname == "player") // don't allow a player inside a player inside another player :)
+	{
+		entity targeteater, oldself;
+		targeteater = self.eater.eater;
+
 		Vore_Regurgitate(self);
+		if(1 == 1) //cvar!!!!!!!!!!!!!!!!
+		if(Swallow_condition_check(self))
+		{
+			oldself = self;
+			self = targeteater;
+			Vore_Swallow(oldself);
+			self = oldself;
+		}
+	}
 	else if(vlen(self.eater.velocity) > cvar("g_balance_vore_regurgitate_velocitylimit"))
 		Vore_Regurgitate(self);