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

qbsp: reject Q2 maps with mixed visible contents

This commit is contained in:
Eric Wasylishen 2023-03-07 22:12:22 -07:00
parent adb7ecce15
commit 7ed36c9bec
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
qbsp/map.cc
View File

@ -1716,6 +1716,21 @@ static void ParseTextureDef(const mapentity_t &entity, parser_t &parser, mapface
} }
} }
// Mixing visible contents on the input brush is illegal
{
const int32_t visible_contents = extinfo.info->contents.native & Q2_ALL_VISIBLE_CONTENTS;
// TODO: Move to bspfile.hh API
for (int32_t i = Q2_CONTENTS_SOLID; i <= Q2_LAST_VISIBLE_CONTENTS; i <<= 1) {
if (visible_contents & i) {
if (visible_contents != i) {
FError("{}: Mixed visible contents: {}", mapface.line,
extinfo.info->contents.to_string(qbsp_options.target_game));
}
}
}
}
// If Q2 style phong is enabled on a mirrored face, `light` will erroneously try to blend normals between // If Q2 style phong is enabled on a mirrored face, `light` will erroneously try to blend normals between
// the front and back faces leading to light artifacts. // the front and back faces leading to light artifacts.
const bool wants_phong = !(extinfo.info->flags.native & Q2_SURF_LIGHT) && (extinfo.info->value != 0); const bool wants_phong = !(extinfo.info->flags.native & Q2_SURF_LIGHT) && (extinfo.info->value != 0);