amacocian/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2026-07-21 01:59:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Codechange: use scoped enum for ScriptSettingSource (#15377)

Browse Source
This commit is contained in:
Peter Nelson
2026-03-08 14:00:23 +00:00
committed by GitHub
parent 61d17c959e
commit 37118b93c7
10 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/settings.cpp
+6 -6
View File
@@ -955,7 +955,7 @@ static void AILoadConfig(const IniFile &ini, std::string_view grpname)
/* Clean any configured AI */
for (CompanyID c = CompanyID::Begin(); c < MAX_COMPANIES; ++c) {
AIConfig::GetConfig(c, AIConfig::SSS_FORCE_NEWGAME)->Change(std::nullopt);
AIConfig::GetConfig(c, AIConfig::ScriptSettingSource::ForceNewGame)->Change(std::nullopt);
}
/* If no group exists, return */
@@ -963,7 +963,7 @@ static void AILoadConfig(const IniFile &ini, std::string_view grpname)
CompanyID c = CompanyID::Begin();
for (const IniItem &item : group->items) {
AIConfig *config = AIConfig::GetConfig(c, AIConfig::SSS_FORCE_NEWGAME);
AIConfig *config = AIConfig::GetConfig(c, AIConfig::ScriptSettingSource::ForceNewGame);
config->Change(item.name);
if (!config->HasScript()) {
@@ -983,14 +983,14 @@ static void GameLoadConfig(const IniFile &ini, std::string_view grpname)
const IniGroup *group = ini.GetGroup(grpname);
/* Clean any configured GameScript */
GameConfig::GetConfig(GameConfig::SSS_FORCE_NEWGAME)->Change(std::nullopt);
GameConfig::GetConfig(GameConfig::ScriptSettingSource::ForceNewGame)->Change(std::nullopt);
/* If no group exists, return */
if (group == nullptr || group->items.empty()) return;
const IniItem &item = group->items.front();
GameConfig *config = GameConfig::GetConfig(AIConfig::SSS_FORCE_NEWGAME);
GameConfig *config = GameConfig::GetConfig(AIConfig::ScriptSettingSource::ForceNewGame);
config->Change(item.name);
if (!config->HasScript()) {
@@ -1186,7 +1186,7 @@ static void AISaveConfig(IniFile &ini, std::string_view grpname)
group.Clear();
for (CompanyID c = CompanyID::Begin(); c < MAX_COMPANIES; ++c) {
AIConfig *config = AIConfig::GetConfig(c, AIConfig::SSS_FORCE_NEWGAME);
AIConfig *config = AIConfig::GetConfig(c, AIConfig::ScriptSettingSource::ForceNewGame);
std::string name;
std::string value = config->SettingsToString();
@@ -1205,7 +1205,7 @@ static void GameSaveConfig(IniFile &ini, std::string_view grpname)
IniGroup &group = ini.GetOrCreateGroup(grpname);
group.Clear();
GameConfig *config = GameConfig::GetConfig(AIConfig::SSS_FORCE_NEWGAME);
GameConfig *config = GameConfig::GetConfig(AIConfig::ScriptSettingSource::ForceNewGame);
std::string name;
std::string value = config->SettingsToString();