miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Codechange: Use sorted vector for NewGRF parameter value names. (#13326)

Browse Source 
This replaces use of a std::map per GRF-parameter.
This commit is contained in:
Peter Nelson
2025-01-17 19:33:11 +00:00
committed by GitHub
parent 610026ef17
commit 2f0b52d5b3
4 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/newgrf_config.cpp
View File

@@ -211,13 +211,13 @@ void GRFConfig::SetValue(const GRFParameterInfo &info, uint32_t value)
*/
void GRFParameterInfo::Finalize()
{
this->complete_labels = true;
for (uint32_t value = this->min_value; value <= this->max_value; value++) {
if (this->value_names.count(value) == 0) {
this->complete_labels = false;
break;
}
}
/* Remove value names outside of the permitted range of values. */
auto it = std::remove_if(std::begin(this->value_names), std::end(this->value_names),
[this](const ValueName &vn) { return vn.first < this->min_value || vn.first > this->max_value; });
this->value_names.erase(it, std::end(this->value_names));
/* Test if the number of named values matches the full ranges of values. -1 because the range is inclusive. */
this->complete_labels = (this->max_value - this->min_value) == std::size(this->value_names) - 1;
}
/**