From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Fri, 17 Mar 2006 03:59:23 +0000 (+0000)
Subject: remove fullbright flag on lava and teleport textures
X-Git-Tag: xonotic-v0.1.0preview~4194
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=213b720520644bb0d26e3d1a0889321eb422b7a0;p=xonotic%2Fdarkplaces.git

remove fullbright flag on lava and teleport textures


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@6125 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/model_brush.c b/model_brush.c
index 6abc8d8f..79f4025e 100644
--- a/model_brush.c
+++ b/model_brush.c
@@ -1316,12 +1316,10 @@ static void Mod_Q1BSP_LoadTextures(lump_t *l)
 		{
 			// turb does not block movement
 			tx->basematerialflags |= MATERIALFLAG_WATER | MATERIALFLAG_LIGHTBOTHSIDES;
-			// LordHavoc: some turbulent textures should be fullbright and solid
-			if (!strncmp(tx->name,"*lava",5)
-			 || !strncmp(tx->name,"*teleport",9)
-			 || !strncmp(tx->name,"*rift",5)) // Scourge of Armagon texture
-				tx->basematerialflags |= MATERIALFLAG_FULLBRIGHT;
-			else
+			// LordHavoc: some turbulent textures should not be affected by wateralpha
+			if (strncmp(tx->name,"*lava",5)
+			 && strncmp(tx->name,"*teleport",9)
+			 && strncmp(tx->name,"*rift",5)) // Scourge of Armagon texture
 				tx->basematerialflags |= MATERIALFLAG_WATERALPHA;
 			if (!strncmp(tx->name, "*lava", 5))
 				tx->supercontents = SUPERCONTENTS_LAVA;