fix detail (again)
This commit is contained in:
parent
000fa217d8
commit
542e6d63ad
|
|
@ -463,7 +463,7 @@ struct gamedef_q2_t : public gamedef_t
|
||||||
int32_t get_content_type(const contentflags_t &contents) const
|
int32_t get_content_type(const contentflags_t &contents) const
|
||||||
{
|
{
|
||||||
return contents.native & (((Q2_LAST_VISIBLE_CONTENTS << 1) - 1) |
|
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
|
int32_t contents_priority(const contentflags_t &contents) const
|
||||||
|
|
|
||||||
|
|
@ -653,6 +653,7 @@ static contentflags_t Brush_GetContents(const mapbrush_t *mapbrush)
|
||||||
for (int i = 0; i < mapbrush->numfaces; i++) {
|
for (int i = 0; i < mapbrush->numfaces; i++) {
|
||||||
const mapface_t &mapface = mapbrush->face(i);
|
const mapface_t &mapface = mapbrush->face(i);
|
||||||
const mtexinfo_t &texinfo = map.mtexinfos.at(mapface.texinfo);
|
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);
|
contentflags_t contents = options.target_game->face_get_contents(mapface.texname.data(), texinfo.flags, mapface.contents);
|
||||||
|
|
||||||
if (contents.is_empty(options.target_game)) {
|
if (contents.is_empty(options.target_game)) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue