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

oops I should have tried compiling

This commit is contained in:
Jonathan 2023-04-24 02:21:04 -04:00
parent 6035290c70
commit e9539eff82
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/bspfile.cc
View File

@ -1799,12 +1799,6 @@ const bspversion_t bspver_qbism{Q2_QBISMIDENT, Q2_BSPVERSION, "qbism", "Quake II
},
&gamedef_q2};
bool surfflags_t::needs_write() const
{
return as_tuple(*this) != as_tuple(surfflags_t());
}
static auto as_tuple(const surfflags_t &flags)
{
return std::tie(flags.native, flags.is_nodraw, flags.is_hintskip, flags.is_hint, flags.no_dirt, flags.no_shadow,
@ -1814,6 +1808,11 @@ static auto as_tuple(const surfflags_t &flags)
flags.world_units_per_luxel, flags.object_channel_mask);
}
bool surfflags_t::needs_write() const
{
return as_tuple(*this) != as_tuple(surfflags_t());
}
bool surfflags_t::operator<(const surfflags_t &other) const
{
return as_tuple(*this) < as_tuple(other);

4
light/entities.cc
View File

@ -338,10 +338,10 @@ static void CheckEntityFields(const mbsp_t *bsp, const settings::worldspawn_keys
entity->shadow_channel_mask.set_value(entity->light_channel_mask.value(), settings::source::DEFAULT);
}
if (!entity->surflight_minlight_scale.isChanged()) {
if (!entity->surflight_minlight_scale.is_changed()) {
if (bsp->loadversion->game->id != GAME_QUAKE_II) {
// TODO: also use 1.0 for Q2?
entity->surflight_minlight_scale.setValue(1.0f, settings::source::DEFAULT);
entity->surflight_minlight_scale.set_value(1.0f, settings::source::DEFAULT);
}
}
}