From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Wed, 4 May 2011 12:07:46 +0000 (+0300)
Subject: Complete my last commit
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=552c632712e834409e220f816baf085563fe0c92;p=voretournament%2Fvoretournament.git

Complete my last commit
---

diff --git a/data/qcsrc/server/cl_weaponsystem.qc b/data/qcsrc/server/cl_weaponsystem.qc
index fdf09dba..cc5e6c62 100644
--- a/data/qcsrc/server/cl_weaponsystem.qc
+++ b/data/qcsrc/server/cl_weaponsystem.qc
@@ -266,12 +266,12 @@ float CL_ExteriorWeaponentity_CustomizeEntityForClient()
 		return TRUE;
 	}
 
-	if(cvar("g_vore_neighborprey_distance") && (other.predator == self.owner.predator || other.fakepredator == self.owner.predator) && !(other.cvar_chase_active || other.classname == "observer"))
-		setmodel(self, strcat("models/weapons/v_", self.owner.weaponname, ".md3")); // show the weapon model of prey when in the same stomach as them and neighborprey is enabled
-	else if(self.owner.stat_eaten)
-		setmodel(self, ""); // hide the weapon model of prey
-	else
+	if not(self.owner.stat_eaten)
 		setmodel(self, strcat("models/weapons/v_", self.owner.weaponname, ".md3"));
+	else if(cvar("g_vore_neighborprey_distance") && (other.predator == self.owner.predator || other.fakepredator == self.owner.predator) && !(other.cvar_chase_active || other.classname == "observer"))
+		setmodel(self, strcat("models/weapons/v_", self.owner.weaponname, ".md3")); // allow seeing neighboring prey's weapon model
+	else
+		setmodel(self, ""); // hide prey's weapon model
 	return TRUE;
 }