From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Fri, 15 Apr 2011 12:21:57 +0000 (+0300)
Subject: Show a no swallow indicator when the entity is a player you could normally swallow... 
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0a3448b0c4774b13ba33e461d44e32e4a864f58d;p=voretournament%2Fvoretournament.git

Show a no swallow indicator when the entity is a player you could normally swallow, but some circumstances don't allow it
---

diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc
index 2d50c99e..a0a337b0 100644
--- a/data/qcsrc/client/View.qc
+++ b/data/qcsrc/client/View.qc
@@ -1008,6 +1008,8 @@ void CSQC_UpdateView(float w, float h)
 				wcross_style = "_canswallow_team.tga";
 			else if(swallow_indicator > 0)
 				wcross_style = "_canswallow.tga";
+			else if(swallow_indicator < 0)
+				wcross_style = "_canswallow_no.tga";
 			else
 				wcross_style = cvar_string("crosshair");
 
diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index d675f5d5..8a9dc2fb 100644
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -547,6 +547,8 @@ void Vore()
 		if(self.BUTTON_ATCK)
 			Vore_Swallow(prey);
 	}
+	else if(prey != world)
+		self.stat_canswallow = -1;
 
 	// toggle digestion, if the player has someone in their stomach
 	if(self.BUTTON_DIGEST && cvar("g_vore_digestion"))