]> git.xonotic.org Git - voretournament/voretournament.git/commitdiff
Apply all properties of the weapon model to the display digits
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Thu, 17 Nov 2011 16:10:33 +0000 (18:10 +0200)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Thu, 17 Nov 2011 16:10:33 +0000 (18:10 +0200)
data/qcsrc/server/cl_weaponsystem.qc

index 590c42c31408b0525abba372ae794b5bd635dad6..e4fc0bd858b5b26558bc4510d2a0d7cfe1d5c5d3 100644 (file)
@@ -1589,12 +1589,20 @@ void W_DisplayThink()
                self = world;\r
                return;\r
        }\r
-       self.nextthink = time;\r
 \r
        if(gettagindex(self.owner.weaponentity, "weapon"))\r
                setattachment(self, self.owner.weaponentity, "weapon");\r
        else if(gettagindex(self.owner.weaponentity, "tag_weapon"))\r
                setattachment(self, self.owner.weaponentity, "tag_weapon");\r
+       self.origin_z = self.owner.weaponentity.weaponentity.origin_z;\r
+       self.scale = self.owner.weaponentity.weaponentity.scale;\r
+       self.effects = self.owner.weaponentity.weaponentity.effects;\r
+       self.alpha = self.owner.weaponentity.weaponentity.alpha;\r
+       self.colormap = self.owner.weaponentity.weaponentity.colormap;\r
+       self.colormod = self.owner.weaponentity.weaponentity.colormod; // used by the regurgitating colors\r
+       self.glowmod = self.owner.weaponentity.weaponentity.glowmod;\r
+\r
+       self.nextthink = time;\r
 }\r
 \r
 void W_DisplaySetup(entity own, float num, float load)\r