From fca531cc0ea0d14ccd28170a2781a3d66e3ba2d7 Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Fri, 3 Sep 2010 00:59:02 +0300 Subject: [PATCH] Do the same for thrown weapons, and remove useless checks. Again, if someone else picks a dirty thrown weapon, it gets clean... no way to fix that. --- data/qcsrc/server/cl_weapons.qc | 2 ++ data/qcsrc/server/cl_weaponsystem.qc | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/qcsrc/server/cl_weapons.qc b/data/qcsrc/server/cl_weapons.qc index 10becd68..3bd7846b 100644 --- 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; if(startitem_failed) return string_null; + wep.colormod = wep.owner.colormod; // used by the regurgitating colors wep.think = thrown_wep_think; wep.nextthink = time + 0.5; return ""; @@ -220,6 +221,7 @@ string W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vecto } s = substring(s, 5, -1); } + wep.colormod = wep.owner.colormod; // used by the regurgitating colors wep.think = thrown_wep_think; wep.nextthink = time + 0.5; return s; diff --git a/data/qcsrc/server/cl_weaponsystem.qc b/data/qcsrc/server/cl_weaponsystem.qc index 7aee65bd..dfe54765 100644 --- 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; self.weaponentity.alpha = self.alpha; self.weaponentity.colormap = self.colormap; - if(self.owner.colormod != '0 0 0') // used by the regurgitating colors - self.weaponentity.colormod = self.owner.colormod; + self.weaponentity.colormod = self.owner.colormod; // used by the regurgitating colors } self.angles = '0 0 0'; @@ -790,8 +789,7 @@ void CL_ExteriorWeaponentity_Think() self.alpha = self.owner.alpha; else self.alpha = 1; - if(self.owner.colormod != '0 0 0') // used by the regurgitating colors - self.colormod = self.owner.colormod; + self.colormod = self.owner.colormod; // used by the regurgitating colors ang_x = bound(sv_pitch_min, self.owner.v_angle_x, sv_pitch_max); ang_y = 0; -- 2.39.2