Hopefully fix display digits showing on gibbed dead players

diff --git a/data/qcsrc/server/cl_weapons.qc b/data/qcsrc/server/cl_weapons.qc
index 2265e6359ba91bb8ef6c0b23dc1d03b4bcfaf01b..01ce3ea747d307ea154354b7a56228c25b1f1d3f 100644 (file)
--- a/data/qcsrc/server/cl_weapons.qc
+++ b/data/qcsrc/server/cl_weapons.qc
@@ -320,7 +320,7 @@ void W_DisplayDigitThink()
        w_ammo = self.owner.(self.owner.current_ammo);\r
 \r
        // the owner has switched to another weapon, remove the digits\r
-       if(!self.owner.display_setup || !self.owner.weapon)\r
+       if(!self.owner.display_setup || !self.owner.weapon || self.owner.deadflag != DEAD_NO)\r
        {\r
                self.nextthink = 0;\r
                remove(self);\r
@@ -455,7 +455,7 @@ void W_WeaponFrame()
        up = v_up;\r
 \r
        // setup weapon display digits\r
-       if(self.weapon != self.switchweapon || self.classname != "player" || self.deadflag != DEAD_NO)\r
+       if(self.weapon != self.switchweapon || self.classname != "player")\r
                self.display_setup = FALSE;\r
        else if(!self.display_setup)\r
        {\r

diff --git a/docs/TODO.txt b/docs/TODO.txt
index d0b8cf5cbfa786c4464f6fe42caea84dab588bb1..a398ed142ec171a34dc54778fa3a491e53bce2c8 100644 (file)
--- a/docs/TODO.txt
+++ b/docs/TODO.txt
@@ -146,6 +146,4 @@
 \r
 - 0.7: Smaller default zoom for minimap\r
 \r
-- 0.7 | 0.8 BUG: Display digits still appear on the 3rd person weapon when a player dies and becomes gibbed\r
-\r
 - 0.7: Bots should digest items even at 0 skill
\ No newline at end of file