]> de.git.xonotic.org Git - voretournament/voretournament.git/commitdiff
Complete my last commit
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Wed, 4 May 2011 12:07:46 +0000 (15:07 +0300)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Wed, 4 May 2011 12:07:46 +0000 (15:07 +0300)
data/qcsrc/server/cl_weaponsystem.qc

index fdf09dba6fa2d725937f9053426298e5f07e699e..cc5e6c623b2007d4bb1befb85fed110ab34dc41d 100644 (file)
@@ -266,12 +266,12 @@ float CL_ExteriorWeaponentity_CustomizeEntityForClient()
                return TRUE;\r
        }\r
 \r
                return TRUE;\r
        }\r
 \r
-       if(cvar("g_vore_neighborprey_distance") && (other.predator == self.owner.predator || other.fakepredator == self.owner.predator) && !(other.cvar_chase_active || other.classname == "observer"))\r
-               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\r
-       else if(self.owner.stat_eaten)\r
-               setmodel(self, ""); // hide the weapon model of prey\r
-       else\r
+       if not(self.owner.stat_eaten)\r
                setmodel(self, strcat("models/weapons/v_", self.owner.weaponname, ".md3"));\r
                setmodel(self, strcat("models/weapons/v_", self.owner.weaponname, ".md3"));\r
+       else if(cvar("g_vore_neighborprey_distance") && (other.predator == self.owner.predator || other.fakepredator == self.owner.predator) && !(other.cvar_chase_active || other.classname == "observer"))\r
+               setmodel(self, strcat("models/weapons/v_", self.owner.weaponname, ".md3")); // allow seeing neighboring prey's weapon model\r
+       else\r
+               setmodel(self, ""); // hide prey's weapon model\r
        return TRUE;\r
 }\r
 \r
        return TRUE;\r
 }\r
 \r