Do the same for thrown weapons, and remove useless checks. Again, if someone else...

[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 6594119f6a092691aa18841544b05b12807a006f..dfe547657b964cd614f3ee6cb15ca347fcf47c3a 100644 (file)
--- a/data/qcsrc/server/cl_weaponsystem.qc
+++ b/data/qcsrc/server/cl_weaponsystem.qc
@@ -578,9 +578,8 @@ void CL_Weaponentity_Think()
                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
        }\r
-       if(self.owner.colormod != '0 0 0') // used by the regurgitating colors\r
-               self.weaponentity.colormod = self.owner.colormod;\r
 \r
        self.angles = '0 0 0';\r
        local float f;\r
@@ -790,8 +789,7 @@ void CL_ExteriorWeaponentity_Think()
                self.alpha = self.owner.alpha;\r
        else\r
                self.alpha = 1;\r
-       if(self.owner.colormod != '0 0 0') // used by the regurgitating colors\r
-               self.exteriorweaponentity.colormod = self.owner.colormod;\r
+       self.colormod = self.owner.colormod; // used by the regurgitating colors\r
 \r
        ang_x = bound(sv_pitch_min, self.owner.v_angle_x, sv_pitch_max);\r
        ang_y = 0;\r