Fix my last fix

[voretournament/voretournament.git] / data / qcsrc / server / cl_weaponsystem.qc

diff --git a/data/qcsrc/server/cl_weaponsystem.qc b/data/qcsrc/server/cl_weaponsystem.qc
index fdf09dba6fa2d725937f9053426298e5f07e699e..144ade6ecc2159ff99b96f90ade6c42e56cdb2a8 100644 (file)
--- a/data/qcsrc/server/cl_weaponsystem.qc
+++ b/data/qcsrc/server/cl_weaponsystem.qc
@@ -256,7 +256,7 @@ float CL_ExteriorWeaponentity_CustomizeEntityForClient()
        if(self.owner.weaponname == "" || self.owner.deadflag != DEAD_NO)\r
                return TRUE;\r
 \r
-       if(other.spectatee_status)\r
+       if(other.spectatee_status && other.spectatee_status == num_for_edict(other.enemy))\r
                other = other.enemy; // also do this for the player we are spectating\r
 \r
        if not(other.cvar_chase_active || other.classname == "observer") // the observer check prevents a bug\r
@@ -266,12 +266,12 @@ float CL_ExteriorWeaponentity_CustomizeEntityForClient()
                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
+       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
@@ -577,12 +577,15 @@ void CL_Weaponentity_Think()
                self.alpha = 1;\r
 \r
        self.colormap = self.owner.colormap;\r
+       self.colormod = self.owner.colormod;\r
+       self.glowmod = self.owner.weaponentity_glowmod;\r
        if (self.weaponentity)\r
        {\r
                self.weaponentity.effects = self.effects;\r
                self.weaponentity.alpha = self.alpha;\r
                self.weaponentity.colormap = self.colormap;\r
                self.weaponentity.colormod = self.owner.colormod; // used by the regurgitating colors\r
+               self.weaponentity.glowmod = self.glowmod;\r
        }\r
 \r
        self.angles = '0 0 0';\r
@@ -841,6 +844,7 @@ void CL_ExteriorWeaponentity_Think()
        }\r
 \r
        self.colormap = self.owner.colormap;\r
+       self.glowmod = self.owner.weaponentity_glowmod;\r
        self.customizeentityforclient = CL_ExteriorWeaponentity_CustomizeEntityForClient;\r
 };\r
 \r