]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
another attempt at fixing solid water in the dedicated server
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Mon, 27 Jun 2011 02:10:35 +0000 (02:10 +0000)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 27 Jun 2011 08:08:08 +0000 (10:08 +0200)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11221 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=c7bc9edf299b5f7f36325de8a5fecb0dfd9b41da

model_brush.c

index 0eee9e317543e39ee79ce0fb1953c7f5bc469ba4..c0e53d339ed6a42dd8e257d2ee2c1ab458416668 100644 (file)
@@ -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