From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Wed, 14 Mar 2012 23:36:28 +0000 (+0200)
Subject: Don't apply the same effect in two places of the code unnecessarily
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=439fb50a286836135d0dba19f3d77378c7f33048;p=voretournament%2Fvoretournament.git

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 05ab1a46..928ab643 100644
--- 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;
 	else
 		self.effects &~= EF_NODEPTHTEST;
+	if(cvar("g_fullbrightplayers"))
+		self.effects |= EF_FULLBRIGHT;
+
 	if not(self.stat_eaten)
 	{
 		self.alpha = default_player_alpha;
@@ -1899,12 +1902,6 @@ void player_powerups (void)
 		}
 	}
 
-	if(cvar("g_nodepthtestplayers"))
-		self.effects = self.effects | EF_NODEPTHTEST;
-
-	if(cvar("g_fullbrightplayers"))
-		self.effects = self.effects | EF_FULLBRIGHT;
-
 	// midair gamemode: damage only while in the air
 	// if in midair mode, being on ground grants temporary invulnerability
 	// (this is so that multishot weapon don't clear the ground flag on the
diff --git a/data/qcsrc/server/cl_weaponsystem.qc b/data/qcsrc/server/cl_weaponsystem.qc
index 9decb8c1..ad316595 100644
--- 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;
 	else
 		self.effects &~= EF_NODEPTHTEST;
+	if(cvar("g_fullbrightplayers"))
+		self.effects |= EF_FULLBRIGHT;
+
 	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 aadf7d23..dcc8631e 100644
--- a/docs/TODO.txt
+++ b/docs/TODO.txt
@@ -128,4 +128,6 @@
 
 - 0.7 | 0.8 BUG: Display digits still disappear after changing maps (but never on the first map)
 
-- 0.8: Make menu song depend on menu skin?
\ No newline at end of file
+- 0.8: Make menu song depend on menu skin?
+
+- 0.7: Make the insides of the color vixen character glow more
\ No newline at end of file