Don't apply the same effect in two places of the code unnecessarily

diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc
index 05ab1a46da3cec63cc7cda31921cd591d57299d3..928ab6434f554cdcd927dfef72f443da37fb2c51 100644 (file)
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -545,6 +545,9 @@ float Client_customizeentityforclient()
                self.effects |= EF_NODEPTHTEST;\r
        else\r
                self.effects &~= EF_NODEPTHTEST;\r
+       if(cvar("g_fullbrightplayers"))\r
+               self.effects |= EF_FULLBRIGHT;\r
+\r
        if not(self.stat_eaten)\r
        {\r
                self.alpha = default_player_alpha;\r
@@ -1899,12 +1902,6 @@ void player_powerups (void)
                }\r
        }\r
 \r
-       if(cvar("g_nodepthtestplayers"))\r
-               self.effects = self.effects | EF_NODEPTHTEST;\r
-\r
-       if(cvar("g_fullbrightplayers"))\r
-               self.effects = self.effects | EF_FULLBRIGHT;\r
-\r
        // midair gamemode: damage only while in the air\r
        // if in midair mode, being on ground grants temporary invulnerability\r
        // (this is so that multishot weapon don't clear the ground flag on the\r

diff --git a/data/qcsrc/server/cl_weaponsystem.qc b/data/qcsrc/server/cl_weaponsystem.qc
index 9decb8c170e12794050d540085b0b427bbb11889..ad316595c39e61bfa60fa606e555fe6a4a0c84ec 100644 (file)
--- a/data/qcsrc/server/cl_weaponsystem.qc
+++ b/data/qcsrc/server/cl_weaponsystem.qc
@@ -276,6 +276,9 @@ float CL_ExteriorWeaponentity_CustomizeEntityForClient()
                self.effects |= EF_NODEPTHTEST;\r
        else\r
                self.effects &~= EF_NODEPTHTEST;\r
+       if(cvar("g_fullbrightplayers"))\r
+               self.effects |= EF_FULLBRIGHT;\r
+\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 aadf7d23dde3fbdf8962a0168d9e3816164c569b..dcc8631e8df8588e62dea1c8ed3707ca12e9df6e 100644 (file)
--- a/docs/TODO.txt
+++ b/docs/TODO.txt
@@ -128,4 +128,6 @@
 \r
 - 0.7 | 0.8 BUG: Display digits still disappear after changing maps (but never on the first map)\r
 \r
-- 0.8: Make menu song depend on menu skin?
\ No newline at end of file
+- 0.8: Make menu song depend on menu skin?\r
+\r
+- 0.7: Make the insides of the color vixen character glow more
\ No newline at end of file