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

qbsp: replace some contents.extended reads with new is_detail_*() getters

This commit is contained in:
Eric Wasylishen 2022-06-10 00:07:01 -06:00
parent 8c1095715c
commit 014e0d8aaa
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qbsp/solidbsp.cc
View File

@ -858,11 +858,11 @@ static void CreateLeaf(std::vector<std::unique_ptr<brush_t>> brushes, node_t *le
if (leafnode->contents.extended & CFLAGS_ILLUSIONARY_VISBLOCKER) {
c_illusionary_visblocker++;
} else if (leafnode->contents.extended & CFLAGS_DETAIL_FENCE) {
} else if (leafnode->contents.is_detail_fence(options.target_game)) {
c_detail_fence++;
} else if (leafnode->contents.extended & CFLAGS_DETAIL_ILLUSIONARY) {
} else if (leafnode->contents.is_detail_illusionary(options.target_game)) {
c_detail_illusionary++;
} else if (leafnode->contents.extended & CFLAGS_DETAIL) {
} else if (leafnode->contents.is_detail_solid(options.target_game)) {
c_detail++;
} else if (leafnode->contents.is_empty(options.target_game)) {
c_empty++;

2
qbsp/writebsp.cc
View File

@ -34,7 +34,7 @@ using nlohmann::json;
static contentflags_t RemapContentsForExport(const contentflags_t &content)
{
if (content.extended & CFLAGS_DETAIL_FENCE) {
if (content.is_detail_fence(options.target_game)) {
/*
* A bit of a hack for Q2, to ensure that structural faces which are completely covered by CFLAGS_DETAIL_FENCE
* still render.