summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
4e41d58)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11215
d7cf8633-e32d-0410-b094-
e92efae38249
if (skinframe)
tx->skinframes[0] = skinframe;
}
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
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->skinframes[0] = R_SkinFrame_LoadInternalBGRA(tx->name, 0, zeroopaque, 1, 1, false);
}
tx->basematerialflags = MATERIALFLAG_WALL;
}
tx->basematerialflags = MATERIALFLAG_WALL;