mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: Use EnumBitSet for ScriptConfigFlags. (#13669)

pull/13632/head
Peter Nelson 2025-02-28 18:57:40 +00:00 committed by GitHub
parent e70f20a781
commit 94783fe2ed
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/ai/ai_info.cpp
View File

@ -37,17 +37,17 @@ template <> SQInteger PushClassName<AIInfo, ScriptType::AI>(HSQUIRRELVM vm) { sq
SQAIInfo.AddConstructor<void (AIInfo::*)(), 1>(engine, "x"); SQAIInfo.AddConstructor<void (AIInfo::*)(), 1>(engine, "x");
SQAIInfo.DefSQAdvancedMethod(engine, &AIInfo::AddSetting, "AddSetting"); SQAIInfo.DefSQAdvancedMethod(engine, &AIInfo::AddSetting, "AddSetting");
SQAIInfo.DefSQAdvancedMethod(engine, &AIInfo::AddLabels, "AddLabels"); SQAIInfo.DefSQAdvancedMethod(engine, &AIInfo::AddLabels, "AddLabels");
SQAIInfo.DefSQConst(engine, SCRIPTCONFIG_NONE, "CONFIG_NONE"); SQAIInfo.DefSQConst(engine, ScriptConfigFlags{}.base(), "CONFIG_NONE");
SQAIInfo.DefSQConst(engine, SCRIPTCONFIG_NONE, "CONFIG_RANDOM"); // Deprecated, mapped to NONE. SQAIInfo.DefSQConst(engine, ScriptConfigFlags{}.base(), "CONFIG_RANDOM"); // Deprecated, mapped to NONE.
SQAIInfo.DefSQConst(engine, SCRIPTCONFIG_BOOLEAN, "CONFIG_BOOLEAN"); SQAIInfo.DefSQConst(engine, ScriptConfigFlags{ScriptConfigFlag::Boolean}.base(), "CONFIG_BOOLEAN");
SQAIInfo.DefSQConst(engine, SCRIPTCONFIG_INGAME, "CONFIG_INGAME"); SQAIInfo.DefSQConst(engine, ScriptConfigFlags{ScriptConfigFlag::InGame}.base(), "CONFIG_INGAME");
SQAIInfo.DefSQConst(engine, SCRIPTCONFIG_DEVELOPER, "CONFIG_DEVELOPER"); SQAIInfo.DefSQConst(engine, ScriptConfigFlags{ScriptConfigFlag::Developer}.base(), "CONFIG_DEVELOPER");
/* Pre 1.2 had an AI prefix */ /* Pre 1.2 had an AI prefix */
SQAIInfo.DefSQConst(engine, SCRIPTCONFIG_NONE, "AICONFIG_NONE"); SQAIInfo.DefSQConst(engine, ScriptConfigFlags{}.base(), "AICONFIG_NONE");
SQAIInfo.DefSQConst(engine, SCRIPTCONFIG_NONE, "AICONFIG_RANDOM"); // Deprecated, mapped to NONE. SQAIInfo.DefSQConst(engine, ScriptConfigFlags{}.base(), "AICONFIG_RANDOM"); // Deprecated, mapped to NONE.
SQAIInfo.DefSQConst(engine, SCRIPTCONFIG_BOOLEAN, "AICONFIG_BOOLEAN"); SQAIInfo.DefSQConst(engine, ScriptConfigFlags{ScriptConfigFlag::Boolean}.base(), "AICONFIG_BOOLEAN");
SQAIInfo.DefSQConst(engine, SCRIPTCONFIG_INGAME, "AICONFIG_INGAME"); SQAIInfo.DefSQConst(engine, ScriptConfigFlags{ScriptConfigFlag::InGame}.base(), "AICONFIG_INGAME");
SQAIInfo.PostRegister(engine); SQAIInfo.PostRegister(engine);
engine->AddMethod("RegisterAI", &AIInfo::Constructor, 2, "tx"); engine->AddMethod("RegisterAI", &AIInfo::Constructor, 2, "tx");

14
src/game/game_gui.cpp
View File

@ -124,7 +124,7 @@ struct GSConfigWindow : public Window {
visible_settings.clear(); visible_settings.clear();
for (const auto &item : *this->gs_config->GetConfigList()) { for (const auto &item : *this->gs_config->GetConfigList()) {
bool no_hide = (item.flags & SCRIPTCONFIG_DEVELOPER) == 0; bool no_hide = !item.flags.Test(ScriptConfigFlag::Developer);
if (no_hide || _settings_client.gui.ai_developer_tools) { if (no_hide || _settings_client.gui.ai_developer_tools) {
visible_settings.push_back(&item); visible_settings.push_back(&item);
} }
@ -193,7 +193,7 @@ struct GSConfigWindow : public Window {
int current_value = this->gs_config->GetSetting(config_item.name); int current_value = this->gs_config->GetSetting(config_item.name);
bool editable = this->IsEditableItem(config_item); bool editable = this->IsEditableItem(config_item);
if ((config_item.flags & SCRIPTCONFIG_BOOLEAN) != 0) { if (config_item.flags.Test(ScriptConfigFlag::Boolean)) {
DrawBoolButton(br.left, y + button_y_offset, current_value != 0, editable); DrawBoolButton(br.left, y + button_y_offset, current_value != 0, editable);
} else { } else {
int i = static_cast<int>(std::distance(std::begin(this->visible_settings), it)); int i = static_cast<int>(std::distance(std::begin(this->visible_settings), it));
@ -264,7 +264,7 @@ struct GSConfigWindow : public Window {
this->clicked_dropdown = false; this->clicked_dropdown = false;
} }
bool bool_item = (config_item.flags & SCRIPTCONFIG_BOOLEAN) != 0; bool bool_item = config_item.flags.Test(ScriptConfigFlag::Boolean);
Rect r = this->GetWidget<NWidgetBase>(widget)->GetCurrentRect().Shrink(WidgetDimensions::scaled.matrix, RectPadding::zero); Rect r = this->GetWidget<NWidgetBase>(widget)->GetCurrentRect().Shrink(WidgetDimensions::scaled.matrix, RectPadding::zero);
int x = pt.x - r.left; int x = pt.x - r.left;
@ -404,15 +404,15 @@ private:
bool IsEditableItem(const ScriptConfigItem &config_item) const bool IsEditableItem(const ScriptConfigItem &config_item) const
{ {
return _game_mode == GM_MENU return _game_mode == GM_MENU
|| _game_mode == GM_EDITOR || _game_mode == GM_EDITOR
|| (config_item.flags & SCRIPTCONFIG_INGAME) != 0 || config_item.flags.Test(ScriptConfigFlag::InGame)
|| _settings_client.gui.ai_developer_tools; || _settings_client.gui.ai_developer_tools;
} }
void SetValue(int value) void SetValue(int value)
{ {
const ScriptConfigItem &config_item = *this->visible_settings[this->clicked_row]; const ScriptConfigItem &config_item = *this->visible_settings[this->clicked_row];
if (_game_mode == GM_NORMAL && (config_item.flags & SCRIPTCONFIG_INGAME) == 0) return; if (_game_mode == GM_NORMAL && !config_item.flags.Test(ScriptConfigFlag::InGame)) return;
this->gs_config->SetSetting(config_item.name, value); this->gs_config->SetSetting(config_item.name, value);
this->SetDirty(); this->SetDirty();
} }

10
src/game/game_info.cpp
View File

@ -35,11 +35,11 @@ template <> SQInteger PushClassName<GameInfo, ScriptType::GS>(HSQUIRRELVM vm) {
SQGSInfo.AddConstructor<void (GameInfo::*)(), 1>(engine, "x"); SQGSInfo.AddConstructor<void (GameInfo::*)(), 1>(engine, "x");
SQGSInfo.DefSQAdvancedMethod(engine, &GameInfo::AddSetting, "AddSetting"); SQGSInfo.DefSQAdvancedMethod(engine, &GameInfo::AddSetting, "AddSetting");
SQGSInfo.DefSQAdvancedMethod(engine, &GameInfo::AddLabels, "AddLabels"); SQGSInfo.DefSQAdvancedMethod(engine, &GameInfo::AddLabels, "AddLabels");
SQGSInfo.DefSQConst(engine, SCRIPTCONFIG_NONE, "CONFIG_NONE"); SQGSInfo.DefSQConst(engine, ScriptConfigFlags{}.base(), "CONFIG_NONE");
SQGSInfo.DefSQConst(engine, SCRIPTCONFIG_NONE, "CONFIG_RANDOM"); // Deprecated, mapped to NONE. SQGSInfo.DefSQConst(engine, ScriptConfigFlags{}.base(), "CONFIG_RANDOM"); // Deprecated, mapped to NONE.
SQGSInfo.DefSQConst(engine, SCRIPTCONFIG_BOOLEAN, "CONFIG_BOOLEAN"); SQGSInfo.DefSQConst(engine, ScriptConfigFlags{ScriptConfigFlag::Boolean}.base(), "CONFIG_BOOLEAN");
SQGSInfo.DefSQConst(engine, SCRIPTCONFIG_INGAME, "CONFIG_INGAME"); SQGSInfo.DefSQConst(engine, ScriptConfigFlags{ScriptConfigFlag::InGame}.base(), "CONFIG_INGAME");
SQGSInfo.DefSQConst(engine, SCRIPTCONFIG_DEVELOPER, "CONFIG_DEVELOPER"); SQGSInfo.DefSQConst(engine, ScriptConfigFlags{ScriptConfigFlag::Developer}.base(), "CONFIG_DEVELOPER");
SQGSInfo.PostRegister(engine); SQGSInfo.PostRegister(engine);
engine->AddMethod("RegisterGS", &GameInfo::Constructor, 2, "tx"); engine->AddMethod("RegisterGS", &GameInfo::Constructor, 2, "tx");

8
src/script/script_config.cpp
View File

@ -73,7 +73,7 @@ void ScriptConfig::ClearConfigList()
void ScriptConfig::AnchorUnchangeableSettings() void ScriptConfig::AnchorUnchangeableSettings()
{ {
for (const auto &item : *this->GetConfigList()) { 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)); 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); const ScriptConfigItem *config_item = this->info->GetConfigItem(it->first);
assert(config_item != nullptr); assert(config_item != nullptr);
bool editable = yet_to_start || (config_item->flags & SCRIPTCONFIG_INGAME) != 0; bool editable = yet_to_start || config_item->flags.Test(ScriptConfigFlag::InGame);
bool visible = _settings_client.gui.ai_developer_tools || (config_item->flags & SCRIPTCONFIG_DEVELOPER) == 0; bool visible = _settings_client.gui.ai_developer_tools || !config_item->flags.Test(ScriptConfigFlag::Developer);
if (editable && visible) { if (editable && visible) {
it = this->settings.erase(it); 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) 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); auto it = config_item.labels.find(value);
if (it != std::end(config_item.labels)) return {STR_JUST_RAW_STRING, it->second}; if (it != std::end(config_item.labels)) return {STR_JUST_RAW_STRING, it->second};

15
src/script/script_config.hpp
View File

@ -17,15 +17,16 @@
/** Maximum of 10 digits for MIN / MAX_INT32, 1 for the sign and 1 for '\0'. */ /** Maximum of 10 digits for MIN / MAX_INT32, 1 for the sign and 1 for '\0'. */
static const int INT32_DIGITS_WITH_SIGN_AND_TERMINATION = 10 + 1 + 1; static const int INT32_DIGITS_WITH_SIGN_AND_TERMINATION = 10 + 1 + 1;
/** Bitmask of flags for Script settings. */ /** Flags for Script settings. */
enum ScriptConfigFlags : uint8_t { enum class ScriptConfigFlag : uint8_t {
SCRIPTCONFIG_NONE = 0x0, ///< No flags set.
// Unused flag 0x1. // Unused flag 0x1.
SCRIPTCONFIG_BOOLEAN = 0x2, ///< This value is a boolean (either 0 (false) or 1 (true) ). Boolean = 1, ///< This value is a boolean (either 0 (false) or 1 (true) ).
SCRIPTCONFIG_INGAME = 0x4, ///< This setting can be changed while the Script is running. InGame = 2, ///< This setting can be changed while the Script is running.
SCRIPTCONFIG_DEVELOPER = 0x8, ///< This setting will only be visible when the Script development tools are active. Developer = 3, ///< This setting will only be visible when the Script development tools are active.
}; };
using ScriptConfigFlags = EnumBitSet<ScriptConfigFlag, uint8_t>;
typedef std::map<int, std::string> LabelMapping; ///< Map-type used to map the setting numbers to labels. typedef std::map<int, std::string> LabelMapping; ///< Map-type used to map the setting numbers to labels.
/** Info about a single Script setting. */ /** Info about a single Script setting. */
@ -36,7 +37,7 @@ struct ScriptConfigItem {
int max_value = 1; ///< The maximal value this configuration setting can have. int max_value = 1; ///< The maximal value this configuration setting can have.
int default_value = 0; ///< The default value of this configuration setting. int default_value = 0; ///< The default value of this configuration setting.
int step_size = 1; ///< The step size in the gui. int step_size = 1; ///< The step size in the gui.
ScriptConfigFlags flags = SCRIPTCONFIG_NONE; ///< Flags for the configuration setting. ScriptConfigFlags flags{}; ///< Flags for the configuration setting.
LabelMapping labels; ///< Text labels for the integer values. LabelMapping labels; ///< Text labels for the integer values.
bool complete_labels = false; ///< True if all values have a label. bool complete_labels = false; ///< True if all values have a label.

10
src/script/script_gui.cpp
View File

@ -314,7 +314,7 @@ struct ScriptSettingsWindow : public Window {
visible_settings.clear(); visible_settings.clear();
for (const auto &item : *this->script_config->GetConfigList()) { for (const auto &item : *this->script_config->GetConfigList()) {
bool no_hide = (item.flags & SCRIPTCONFIG_DEVELOPER) == 0; bool no_hide = !item.flags.Test(ScriptConfigFlag::Developer);
if (no_hide || _settings_client.gui.ai_developer_tools) { if (no_hide || _settings_client.gui.ai_developer_tools) {
visible_settings.push_back(&item); visible_settings.push_back(&item);
} }
@ -360,7 +360,7 @@ struct ScriptSettingsWindow : public Window {
int current_value = this->script_config->GetSetting(config_item.name); int current_value = this->script_config->GetSetting(config_item.name);
bool editable = this->IsEditableItem(config_item); bool editable = this->IsEditableItem(config_item);
if ((config_item.flags & SCRIPTCONFIG_BOOLEAN) != 0) { if (config_item.flags.Test(ScriptConfigFlag::Boolean)) {
DrawBoolButton(br.left, y + button_y_offset, current_value != 0, editable); DrawBoolButton(br.left, y + button_y_offset, current_value != 0, editable);
} else { } else {
int i = static_cast<int>(std::distance(std::begin(this->visible_settings), it)); int i = static_cast<int>(std::distance(std::begin(this->visible_settings), it));
@ -403,7 +403,7 @@ struct ScriptSettingsWindow : public Window {
this->clicked_dropdown = false; this->clicked_dropdown = false;
} }
bool bool_item = (config_item.flags & SCRIPTCONFIG_BOOLEAN) != 0; bool bool_item = config_item.flags.Test(ScriptConfigFlag::Boolean);
Rect r = this->GetWidget<NWidgetBase>(widget)->GetCurrentRect().Shrink(WidgetDimensions::scaled.matrix, RectPadding::zero); Rect r = this->GetWidget<NWidgetBase>(widget)->GetCurrentRect().Shrink(WidgetDimensions::scaled.matrix, RectPadding::zero);
int x = pt.x - r.left; int x = pt.x - r.left;
@ -537,14 +537,14 @@ private:
return _game_mode == GM_MENU return _game_mode == GM_MENU
|| _game_mode == GM_EDITOR || _game_mode == GM_EDITOR
|| ((this->slot != OWNER_DEITY) && !Company::IsValidID(this->slot)) || ((this->slot != OWNER_DEITY) && !Company::IsValidID(this->slot))
|| (config_item.flags & SCRIPTCONFIG_INGAME) != 0 || config_item.flags.Test(ScriptConfigFlag::InGame)
|| _settings_client.gui.ai_developer_tools; || _settings_client.gui.ai_developer_tools;
} }
void SetValue(int value) void SetValue(int value)
{ {
const ScriptConfigItem &config_item = *this->visible_settings[this->clicked_row]; const ScriptConfigItem &config_item = *this->visible_settings[this->clicked_row];
if (_game_mode == GM_NORMAL && ((this->slot == OWNER_DEITY) || Company::IsValidID(this->slot)) && (config_item.flags & SCRIPTCONFIG_INGAME) == 0) return; if (_game_mode == GM_NORMAL && ((this->slot == OWNER_DEITY) || Company::IsValidID(this->slot)) && !config_item.flags.Test(ScriptConfigFlag::InGame)) return;
this->script_config->SetSetting(config_item.name, value); this->script_config->SetSetting(config_item.name, value);
this->SetDirty(); this->SetDirty();
} }

2
src/script/script_info.cpp
View File

@ -177,7 +177,7 @@ SQInteger ScriptInfo::AddSetting(HSQUIRRELVM vm)
} }
/* Make sure all properties are defined */ /* Make sure all properties are defined */
uint mask = (config.flags & SCRIPTCONFIG_BOOLEAN) ? 0x1F3 : 0x1FF; uint mask = config.flags.Test(ScriptConfigFlag::Boolean) ? 0x1F3 : 0x1FF;
if (items != mask) { if (items != mask) {
this->engine->ThrowError("please define all properties of a setting (min/max not allowed for booleans)"); this->engine->ThrowError("please define all properties of a setting (min/max not allowed for booleans)");
return SQ_ERROR; return SQ_ERROR;