olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

move the sky|nodraw fix to an earlier stage

This commit is contained in:
Jonathan 2022-06-02 12:18:58 -04:00
parent 6ba71cb1b9
commit 9bce4fd80a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qbsp/map.cc
View File

@ -361,12 +361,6 @@ static surfflags_t SurfFlagsForEntity(const mtexinfo_t &texinfo, const mapentity
} else {
flags.native = texinfo.flags.native;
// This fixes a bug in some old maps.
if ((flags.native & (Q2_SURF_SKY | Q2_SURF_NODRAW)) == (Q2_SURF_SKY | Q2_SURF_NODRAW)) {
flags.native &= ~Q2_SURF_NODRAW;
// logging::print("Corrected invalid SKY flag\n");
}
if ((flags.native & Q2_SURF_NODRAW) || IsSkipName(texname))
flags.is_skip = true;
if ((flags.native & Q2_SURF_HINT) || IsHintName(texname))
@ -1403,6 +1397,12 @@ static void ParseTextureDef(parser_t &parser, mapface_t &mapface, const mapbrush
// remove TRANSLUCENT; it's only meant to be set by the compiler
extinfo.info->contents.native &= ~Q2_CONTENTS_TRANSLUCENT;
// This fixes a bug in some old maps.
if ((extinfo.info->flags.native & (Q2_SURF_SKY | Q2_SURF_NODRAW)) == (Q2_SURF_SKY | Q2_SURF_NODRAW)) {
extinfo.info->flags.native &= ~Q2_SURF_NODRAW;
//logging::print("corrected invalid SKY flag\n");
}
}
tx->miptex = FindMiptex(mapface.texname.c_str(), extinfo.info);