Fix g_nodepthtestplayers

diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc
index 098f5be609d6570bd6f7aa394d6db271b7021a46..05ab1a46da3cec63cc7cda31921cd591d57299d3 100644 (file)
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -541,7 +541,10 @@ float Client_customizeentityforclient()
        }\r
 \r
        Client_setmodel(setmodel_state());\r
-       self.effects &~= EF_NODEPTHTEST;\r
+       if(cvar("g_nodepthtestplayers"))\r
+               self.effects |= EF_NODEPTHTEST;\r
+       else\r
+               self.effects &~= EF_NODEPTHTEST;\r
        if not(self.stat_eaten)\r
        {\r
                self.alpha = default_player_alpha;\r

diff --git a/data/qcsrc/server/cl_weaponsystem.qc b/data/qcsrc/server/cl_weaponsystem.qc
index 8a9ff0d2ec0fd9e1e2fd3f5d91d7dec55ff37164..40013071b5eb60b8201c18c909e7e60f38c964b9 100644 (file)
--- a/data/qcsrc/server/cl_weaponsystem.qc
+++ b/data/qcsrc/server/cl_weaponsystem.qc
@@ -272,7 +272,10 @@ float CL_ExteriorWeaponentity_CustomizeEntityForClient()
                return TRUE;\r
        }\r
 \r
-       self.effects &~= EF_NODEPTHTEST;\r
+       if(cvar("g_nodepthtestplayers"))\r
+               self.effects |= EF_NODEPTHTEST;\r
+       else\r
+               self.effects &~= EF_NODEPTHTEST;\r
        if not(self.owner.stat_eaten)\r
                setmodel(self, strcat("models/weapons/v_", self.owner.weaponname, ".md3"));\r
        else if(cvar("g_vore_neighborprey_distance") && other.predator == self.owner.predator && !(chase || other.classname == "observer"))\r

diff --git a/docs/TODO.txt b/docs/TODO.txt
index 566c66e04dd248bea8d648355b79bf074483385f..1c0e87d381e79df94927c75d613bb91c4c3a5046 100644 (file)
--- a/docs/TODO.txt
+++ b/docs/TODO.txt
@@ -66,7 +66,7 @@
 \r
 - 0.8: Loading screens with messages\r
 \r
-- 0.7 | 0.8: HUD ring; Make a glow?\r
+- 0.8: HUD ring; Make a glow?\r
 \r
 - +0.8: Refraction effect for damage when you have armor (with a model)\r
 \r
@@ -78,8 +78,6 @@
 \r
 - 0.7 | 0.8: bot_nomove cvar, and add it in Xonotic too\r
 \r
-- 0.7: Make sure default player depthtest works\r
-\r
 - +0.8: Add info about consumable items to tutorial map\r
 \r
 - +0.8: Add icons to indicate live prey + dead prey + items\r