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

remove hardcoded lightstyles max, use config option

This commit is contained in:
Jonathan 2022-06-10 04:22:12 -04:00
parent 4941a86cbe
commit 0d56c49d7a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/light/light.hh
View File

@ -270,6 +270,8 @@ public:
setting_bool spotlightautofalloff{this, "spotlightautofalloff", false, &worldspawn_group}; // mxd
setting_int32 compilerstyle_start{
this, "compilerstyle_start", 32, &worldspawn_group}; // start index for switchable light styles, default 32
setting_int32 compilerstyle_max{
this, "compilerstyle_max", 64, &worldspawn_group}; // max index for switchable light styles, default 64
/* dirt */
setting_bool globalDirt{this, {"dirt", "dirty"}, false,

8
light/entities.cc
View File

@ -63,8 +63,6 @@ const char *light_t::classname() const
static std::vector<std::pair<std::string, int>> lightstyleForTargetname;
#define MAX_SWITCHABLE_STYLES 64
static entdict_t &WorldEnt()
{
if (entdicts.size() == 0 || entdicts.at(0).get("classname") != "worldspawn") {
@ -101,8 +99,8 @@ static int LightStyleForTargetname(const settings::worldspawn_keys &cfg, const s
const int newStylenum = cfg.compilerstyle_start.value() + lightstyleForTargetname.size();
// check if full
if (newStylenum >= MAX_SWITCHABLE_STYLES) {
FError("Too many unique light targetnames (max={})\n", MAX_SWITCHABLE_STYLES);
if (newStylenum >= cfg.compilerstyle_max.value()) {
FError("Too many unique light targetnames (max={})\n", cfg.compilerstyle_max.value());
}
lightstyleForTargetname.emplace_back(targetname, newStylenum);
@ -1197,7 +1195,7 @@ void WriteEntitiesToString(const settings::worldspawn_keys &cfg, mbsp_t *bsp)
/* FIXME - why are we printing this here? */
logging::print("{} switchable light styles ({} max)\n", lightstyleForTargetname.size(),
MAX_SWITCHABLE_STYLES - cfg.compilerstyle_start.value());
cfg.compilerstyle_max.value() - cfg.compilerstyle_start.value());
}
/*