]> git.rm.cloudns.org Git - voretournament/voretournament.git/commitdiff
Display digits - Use owner.weapon, not owner.switchweapon
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Fri, 18 Nov 2011 13:41:17 +0000 (15:41 +0200)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Fri, 18 Nov 2011 13:41:17 +0000 (15:41 +0200)
data/qcsrc/server/cl_weaponsystem.qc

index b16a5efb3dca21c9e3748a2c86b3951e1e81aea6..58d96ec4db87260dfea17fa628ce4b2cc2141761 100644 (file)
@@ -1584,7 +1584,7 @@ void W_DisplayDigitThink()
        self.nextthink = time;\r
 \r
        // the owner has switched to another weapon, remove the digits\r
-       if(self.weapon != self.owner.switchweapon)\r
+       if(self.weapon != self.owner.weapon)\r
        {\r
                self.nextthink = 0;\r
                remove(self);\r
@@ -1630,7 +1630,7 @@ void W_DisplayDigitThink()
                }\r
                else\r
                {\r
-                       txt = ftos(floor(self.owner.weapon_load[self.owner.switchweapon]));\r
+                       txt = ftos(floor(self.owner.weapon_load[self.owner.weapon]));\r
                        txt = substring(txt, self.cnt - 1, 1);\r
                }\r
        }\r
@@ -1651,7 +1651,7 @@ void W_DisplayDigitSetup(entity own, float num, float load, float exterior)
        entity digit, e;\r
        digit = spawn();\r
        digit.owner = own;\r
-       digit.weapon = own.switchweapon;\r
+       digit.weapon = own.weapon;\r
        digit.dmg = exterior;\r
        digit.team = load;\r
        digit.cnt = num;\r