From: MirceaKitsune Date: Wed, 14 Mar 2012 22:09:30 +0000 (+0200) Subject: Fix g_nodepthtestplayers X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=393f17e9da667e8e5cac5abceb264c0f9289fa81;p=voretournament%2Fvoretournament.git Fix g_nodepthtestplayers --- diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc index 098f5be6..05ab1a46 100644 --- a/data/qcsrc/server/cl_client.qc +++ b/data/qcsrc/server/cl_client.qc @@ -541,7 +541,10 @@ float Client_customizeentityforclient() } Client_setmodel(setmodel_state()); - self.effects &~= EF_NODEPTHTEST; + if(cvar("g_nodepthtestplayers")) + self.effects |= EF_NODEPTHTEST; + else + self.effects &~= EF_NODEPTHTEST; if not(self.stat_eaten) { self.alpha = default_player_alpha; diff --git a/data/qcsrc/server/cl_weaponsystem.qc b/data/qcsrc/server/cl_weaponsystem.qc index 8a9ff0d2..40013071 100644 --- a/data/qcsrc/server/cl_weaponsystem.qc +++ b/data/qcsrc/server/cl_weaponsystem.qc @@ -272,7 +272,10 @@ float CL_ExteriorWeaponentity_CustomizeEntityForClient() return TRUE; } - self.effects &~= EF_NODEPTHTEST; + if(cvar("g_nodepthtestplayers")) + self.effects |= EF_NODEPTHTEST; + else + self.effects &~= EF_NODEPTHTEST; if not(self.owner.stat_eaten) setmodel(self, strcat("models/weapons/v_", self.owner.weaponname, ".md3")); else if(cvar("g_vore_neighborprey_distance") && other.predator == self.owner.predator && !(chase || other.classname == "observer")) diff --git a/docs/TODO.txt b/docs/TODO.txt index 566c66e0..1c0e87d3 100644 --- a/docs/TODO.txt +++ b/docs/TODO.txt @@ -66,7 +66,7 @@ - 0.8: Loading screens with messages -- 0.7 | 0.8: HUD ring; Make a glow? +- 0.8: HUD ring; Make a glow? - +0.8: Refraction effect for damage when you have armor (with a model) @@ -78,8 +78,6 @@ - 0.7 | 0.8: bot_nomove cvar, and add it in Xonotic too -- 0.7: Make sure default player depthtest works - - +0.8: Add info about consumable items to tutorial map - +0.8: Add icons to indicate live prey + dead prey + items