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

diff --git a/data/qcsrc/server/cl_weapons.qc b/data/qcsrc/server/cl_weapons.qc
index 10becd6850f6a31777b80d353a05492baa746394..3bd7846b89ea4399e8be8d13d05645a0cb2afc92 100644 (file)
--- a/data/qcsrc/server/cl_weapons.qc
+++ b/data/qcsrc/server/cl_weapons.qc
@@ -192,6 +192,7 @@ string W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vecto
                self = oldself;\r
                if(startitem_failed)\r
                        return string_null;\r
+               wep.colormod = wep.owner.colormod; // used by the regurgitating colors\r
                wep.think = thrown_wep_think;\r
                wep.nextthink = time + 0.5;\r
                return "";\r
@@ -220,6 +221,7 @@ string W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vecto
                        }\r
                        s = substring(s, 5, -1);\r
                }\r
+               wep.colormod = wep.owner.colormod; // used by the regurgitating colors\r
                wep.think = thrown_wep_think;\r
                wep.nextthink = time + 0.5;\r
                return s;\r

diff --git a/data/qcsrc/server/cl_weaponsystem.qc b/data/qcsrc/server/cl_weaponsystem.qc
index 7aee65bdd872588ee6c12e89d4fa99682a79db80..dfe547657b964cd614f3ee6cb15ca347fcf47c3a 100644 (file)
--- a/data/qcsrc/server/cl_weaponsystem.qc
+++ b/data/qcsrc/server/cl_weaponsystem.qc
@@ -578,8 +578,7 @@ void CL_Weaponentity_Think()
                self.weaponentity.effects = self.effects;\r
                self.weaponentity.alpha = self.alpha;\r
                self.weaponentity.colormap = self.colormap;\r
-               if(self.owner.colormod != '0 0 0') // used by the regurgitating colors\r
-                       self.weaponentity.colormod = self.owner.colormod;\r
+               self.weaponentity.colormod = self.owner.colormod; // used by the regurgitating colors\r
        }\r
 \r
        self.angles = '0 0 0';\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.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