From 2f2e7f4cce338da36d1febc649481604d814f9b8 Mon Sep 17 00:00:00 2001 From: havoc Date: Sun, 26 Jun 2011 04:52:15 +0000 Subject: [PATCH] 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 ::stable-branch::merge=7b54444c08e4d206acaf8e302be47e6dfe1f9b7d --- model_brush.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) 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; -- 2.39.2