From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Mon, 27 Jun 2011 02:10:35 +0000 (+0000)
Subject: another attempt at fixing solid water in the dedicated server
X-Git-Tag: xonotic-v0.6.0~163^2~329
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=commitdiff_plain;h=c7bc9edf299b5f7f36325de8a5fecb0dfd9b41da

another attempt at fixing solid water in the dedicated server


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

diff --git a/model_brush.c b/model_brush.c
index 0eee9e31..c0e53d33 100644
--- a/model_brush.c
+++ b/model_brush.c
@@ -1828,10 +1828,7 @@ static void Mod_Q1BSP_LoadTextures(lump_t *l)
 		{
 			// LordHavoc: some turbulent textures should not be affected by wateralpha
 			if (!strncmp(tx->name, "*glassmirror", 12)) // Tenebrae
-			{
-				// replace the texture with transparent black
 				tx->basematerialflags |= MATERIALFLAG_NOSHADOW | MATERIALFLAG_ADD | MATERIALFLAG_BLENDED | MATERIALFLAG_REFLECTION;
-			}
 			else if (!strncmp(tx->name,"*lava",5)
 			 || !strncmp(tx->name,"*teleport",9)
 			 || !strncmp(tx->name,"*rift",5)) // Scourge of Armagon texture
@@ -1856,6 +1853,7 @@ static void Mod_Q1BSP_LoadTextures(lump_t *l)
 		// start out with no animation
 		tx->currentframe = tx;
 		tx->currentskinframe = tx->skinframes[0];
+		tx->currentmaterialflags = tx->basematerialflags;
 	}
 
 	// sequence the animations