Adapt the coloring system in Xonotic. The second player color will no longer be pants...

[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 cc5e6c623b2007d4bb1befb85fed110ab34dc41d..cf64d15103432df58c14701776e08b9f98968ee8 100644 (file)
--- a/data/qcsrc/server/cl_weaponsystem.qc
+++ b/data/qcsrc/server/cl_weaponsystem.qc
@@ -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