From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sun, 26 Jun 2011 04:52:15 +0000 (+0000)
Subject: cleaned up the fix for solid water in q1bsp dedicated servers
X-Git-Tag: xonotic-v0.6.0~163^2~335
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7b54444c08e4d206acaf8e302be47e6dfe1f9b7d;p=xonotic%2Fdarkplaces.git

cleaned up the fix for solid water in q1bsp dedicated servers


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

diff --git a/model_brush.c b/model_brush.c
index ace67cea..0eee9e31 100644
--- a/model_brush.c
+++ b/model_brush.c
@@ -1816,20 +1816,11 @@ static void Mod_Q1BSP_LoadTextures(lump_t *l)
 				if (skinframe)
 					tx->skinframes[0] = skinframe;
 			}
-			if (tx->name[0] == '*')
-			{
-				// LordHavoc: some turbulent textures should not be affected by wateralpha
-				if (!strncmp(tx->name, "*glassmirror", 12)) // Tenebrae
-				{
-					// replace the texture with transparent black
-					tx->skinframes[0] = R_SkinFrame_LoadInternalBGRA(tx->name, TEXF_MIPMAP | TEXF_ALPHA, zerotrans, 1, 1, false);
-				}
-			}
+			// LordHavoc: some Tenebrae textures get replaced by black
+			if (!strncmp(tx->name, "*glassmirror", 12)) // Tenebrae
+				tx->skinframes[0] = R_SkinFrame_LoadInternalBGRA(tx->name, TEXF_MIPMAP | TEXF_ALPHA, zerotrans, 1, 1, false);
 			else if (!strncmp(tx->name, "mirror", 6)) // Tenebrae
-			{
-				// replace the texture with black
 				tx->skinframes[0] = R_SkinFrame_LoadInternalBGRA(tx->name, 0, zeroopaque, 1, 1, false);
-			}
 		}
 
 		tx->basematerialflags = MATERIALFLAG_WALL;