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

Codechange: Use EnumBitSet for ScriptConfigFlags. (#13669)

Browse Source
This commit is contained in:
Peter Nelson
2025-02-28 18:57:40 +00:00
committed by GitHub
parent e70f20a781
commit 94783fe2ed
7 changed files with 39 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/script/script_config.cpp
View File

@@ -73,7 +73,7 @@ void ScriptConfig::ClearConfigList()
void ScriptConfig::AnchorUnchangeableSettings()
{
for (const auto &item : *this->GetConfigList()) {
if ((item.flags & SCRIPTCONFIG_INGAME) == 0) {
if (!item.flags.Test(ScriptConfigFlag::InGame)) {
this->SetSetting(item.name, this->GetSetting(item.name));
}
}
@@ -112,8 +112,8 @@ void ScriptConfig::ResetEditableSettings(bool yet_to_start)
const ScriptConfigItem *config_item = this->info->GetConfigItem(it->first);
assert(config_item != nullptr);
bool editable = yet_to_start || (config_item->flags & SCRIPTCONFIG_INGAME) != 0;
bool visible = _settings_client.gui.ai_developer_tools || (config_item->flags & SCRIPTCONFIG_DEVELOPER) == 0;
bool editable = yet_to_start || config_item->flags.Test(ScriptConfigFlag::InGame);
bool visible = _settings_client.gui.ai_developer_tools || !config_item->flags.Test(ScriptConfigFlag::Developer);
if (editable && visible) {
it = this->settings.erase(it);
@@ -193,7 +193,7 @@ ScriptInstance::ScriptData *ScriptConfig::GetToLoadData()
static std::pair<StringParameter, StringParameter> GetValueParams(const ScriptConfigItem &config_item, int value)
{
if ((config_item.flags & SCRIPTCONFIG_BOOLEAN) != 0) return {value != 0 ? STR_CONFIG_SETTING_ON : STR_CONFIG_SETTING_OFF, {}};
if (config_item.flags.Test(ScriptConfigFlag::Boolean)) return {value != 0 ? STR_CONFIG_SETTING_ON : STR_CONFIG_SETTING_OFF, {}};
auto it = config_item.labels.find(value);
if (it != std::end(config_item.labels)) return {STR_JUST_RAW_STRING, it->second};