another attempt at fixing solid water in the dedicated server

[xonotic/darkplaces.git] / model_brush.c

diff --git a/model_brush.c b/model_brush.c
index 0eee9e317543e39ee79ce0fb1953c7f5bc469ba4..c0e53d339ed6a42dd8e257d2ee2c1ab458416668 100644 (file)
--- 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