From 542e6d63adec6b4c6bbc7c70ab8f1163149991bf Mon Sep 17 00:00:00 2001 From: Jonathan Date: Wed, 16 Feb 2022 19:54:12 -0500 Subject: [PATCH] fix detail (again) --- common/bspfile.cc | 2 +- qbsp/brush.cc | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/common/bspfile.cc b/common/bspfile.cc index 658db814..4ede54e5 100644 --- a/common/bspfile.cc +++ b/common/bspfile.cc @@ -463,7 +463,7 @@ struct gamedef_q2_t : public gamedef_t int32_t get_content_type(const contentflags_t &contents) const { return contents.native & (((Q2_LAST_VISIBLE_CONTENTS << 1) - 1) | - (Q2_CONTENTS_PLAYERCLIP | Q2_CONTENTS_MONSTERCLIP | Q2_CONTENTS_ORIGIN | Q2_CONTENTS_DETAIL | Q2_CONTENTS_TRANSLUCENT | Q2_CONTENTS_AREAPORTAL)); + (Q2_CONTENTS_PLAYERCLIP | Q2_CONTENTS_MONSTERCLIP | Q2_CONTENTS_ORIGIN | Q2_CONTENTS_TRANSLUCENT | Q2_CONTENTS_AREAPORTAL)); } int32_t contents_priority(const contentflags_t &contents) const diff --git a/qbsp/brush.cc b/qbsp/brush.cc index 16d6d3b8..4b5bcb96 100644 --- a/qbsp/brush.cc +++ b/qbsp/brush.cc @@ -653,6 +653,7 @@ static contentflags_t Brush_GetContents(const mapbrush_t *mapbrush) for (int i = 0; i < mapbrush->numfaces; i++) { const mapface_t &mapface = mapbrush->face(i); const mtexinfo_t &texinfo = map.mtexinfos.at(mapface.texinfo); + contentflags_t contents = options.target_game->face_get_contents(mapface.texname.data(), texinfo.flags, mapface.contents); if (contents.is_empty(options.target_game)) {