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

bspfile: contents_are_[empty/solid/sky/liquid]: return false if an extended content type

This commit is contained in:
Eric Wasylishen 2021-10-25 01:11:09 -06:00
parent 02d3284045
commit d2837eb58c
1 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
common/bspfile.cc
View File

@ -171,21 +171,33 @@ struct gamedef_q1_like_t : public gamedef_t
bool contents_are_empty(const contentflags_t &contents) const bool contents_are_empty(const contentflags_t &contents) const
{ {
if (contents.extended & CFLAGS_CONTENTS_MASK)
return false;
return contents.native == CONTENTS_EMPTY; return contents.native == CONTENTS_EMPTY;
} }
bool contents_are_solid(const contentflags_t& contents) const bool contents_are_solid(const contentflags_t& contents) const
{ {
if (contents.extended & CFLAGS_CONTENTS_MASK)
return false;
return contents.native == CONTENTS_SOLID; return contents.native == CONTENTS_SOLID;
} }
bool contents_are_sky(const contentflags_t& contents) const bool contents_are_sky(const contentflags_t& contents) const
{ {
if (contents.extended & CFLAGS_CONTENTS_MASK)
return false;
return contents.native == CONTENTS_SKY; return contents.native == CONTENTS_SKY;
} }
bool contents_are_liquid(const contentflags_t &contents) const bool contents_are_liquid(const contentflags_t &contents) const
{ {
if (contents.extended & CFLAGS_CONTENTS_MASK)
return false;
return contents.native <= CONTENTS_WATER && contents.native >= CONTENTS_LAVA; return contents.native <= CONTENTS_WATER && contents.native >= CONTENTS_LAVA;
} }
@ -346,14 +358,29 @@ struct gamedef_q2_t : public gamedef_t
bool contents_are_empty(const contentflags_t &contents) const bool contents_are_empty(const contentflags_t &contents) const
{ {
if (contents.extended & CFLAGS_CONTENTS_MASK)
return false;
return !(contents.native & ((Q2_LAST_VISIBLE_CONTENTS << 1) - 1)); return !(contents.native & ((Q2_LAST_VISIBLE_CONTENTS << 1) - 1));
} }
bool contents_are_solid(const contentflags_t &contents) const { return contents.native & Q2_CONTENTS_SOLID; } bool contents_are_solid(const contentflags_t &contents) const
{
if (contents.extended & CFLAGS_CONTENTS_MASK)
return false;
return contents.native & Q2_CONTENTS_SOLID;
}
bool contents_are_sky(const contentflags_t &contents) const { return false; } bool contents_are_sky(const contentflags_t &contents) const { return false; }
bool contents_are_liquid(const contentflags_t &contents) const { return contents.native & Q2_CONTENTS_LIQUID; } bool contents_are_liquid(const contentflags_t &contents) const
{
if (contents.extended & CFLAGS_CONTENTS_MASK)
return false;
return contents.native & Q2_CONTENTS_LIQUID;
}
bool contents_are_valid(const contentflags_t &contents, bool strict) const bool contents_are_valid(const contentflags_t &contents, bool strict) const
{ {