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

Codechange: Simplify AI/GameConfig::GetConfig. (#13900)

Browse Source 
Reorganise these methods to reduce nesting and remove a raw pointer to a unique_ptr.
This commit is contained in:
Peter Nelson
2025-03-26 21:53:05 +00:00
committed by GitHub
parent 325f7f9767
commit ff08a22aa4
2 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/game_config.cpp
+6 -8
View File
@@ -17,14 +17,12 @@
/* static */ GameConfig *GameConfig::GetConfig(ScriptSettingSource source)
{
std::unique_ptr<GameConfig> *config;
if (source == SSS_FORCE_NEWGAME || (source == SSS_DEFAULT && _game_mode == GM_MENU)) {
config = &_settings_newgame.script_config.game;
} else {
config = &_settings_game.script_config.game;
}
if (*config == nullptr) *config = std::make_unique<GameConfig>();
return config->get();
if (_game_mode == GM_MENU) source = SSS_FORCE_NEWGAME;
auto &config = (source == SSS_FORCE_NEWGAME) ? _settings_newgame.script_config.game : _settings_game.script_config.game;
if (config == nullptr) config = std::make_unique<GameConfig>();
return config.get();
}
class GameInfo *GameConfig::GetInfo() const