Fix the other bug too. We now have no more known bugs :)

[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..3430c1a961ad6d0f4f656728756f064cfafcc01e 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
@@ -973,7 +971,6 @@ void weapon_setup(float windex)
        // the two weapon entities will notice this has changed and update their models\r
        self.weapon = windex;\r
        self.weaponname = e.mdl;\r
-       self.bulletcounter = 0;\r
 };\r
 \r
 // perform weapon to attack (weaponstate and attack_finished check is here)\r
@@ -1030,7 +1027,6 @@ float weapon_prepareattack(float secondary, float attacktime)
                }\r
                ATTACK_FINISHED(self) = ATTACK_FINISHED(self) + attacktime * W_WeaponRateFactor();\r
        }\r
-       self.bulletcounter += 1;\r
        //dprint("attack finished ", ftos(ATTACK_FINISHED(self)), "\n");\r
        return TRUE;\r
 };\r