diff options
| author | yexo <yexo@openttd.org> | 2010-03-15 22:42:43 +0000 |
|---|---|---|
| committer | yexo <yexo@openttd.org> | 2010-03-15 22:42:43 +0000 |
| commit | e3591f8a1d0b0e5a84cc8b9d45bb5809a622d1f2 (patch) | |
| tree | 93ba6a93348ba5abc5fa64a3ef933a5319f27349 /src/ai | |
| parent | 30189ff459d08142baa9fac9f67dd6246faeae27 (diff) | |
| download | openttd-e3591f8a1d0b0e5a84cc8b9d45bb5809a622d1f2.tar.xz | |
(svn r19429) -Fix: when the title game contains an AIPL block the AI settinsg where overwritten by those from the title game
Diffstat (limited to 'src/ai')
| -rw-r--r-- | src/ai/ai_config.cpp | 8 | ||||
| -rw-r--r-- | src/ai/ai_config.hpp | 10 |
2 files changed, 13 insertions, 5 deletions
diff --git a/src/ai/ai_config.cpp b/src/ai/ai_config.cpp index c0ae01848..aab8b1f18 100644 --- a/src/ai/ai_config.cpp +++ b/src/ai/ai_config.cpp @@ -93,13 +93,13 @@ const AIConfigItemList *AIConfig::GetConfigList() return this->config_list; } -AIConfig *AIConfig::GetConfig(CompanyID company, bool forceNewgameSetting) +AIConfig *AIConfig::GetConfig(CompanyID company, AISettingSource source) { AIConfig **config; - if (!forceNewgameSetting) { - config = (_game_mode == GM_MENU) ? &_settings_newgame.ai_config[company] : &_settings_game.ai_config[company]; - } else { + if (source == AISS_FORCE_NEWGAME || (source == AISS_DEFAULT && _game_mode == GM_MENU)) { config = &_settings_newgame.ai_config[company]; + } else { + config = &_settings_game.ai_config[company]; } if (*config == NULL) *config = new AIConfig(); return *config; diff --git a/src/ai/ai_config.hpp b/src/ai/ai_config.hpp index 314082aa4..98e98263c 100644 --- a/src/ai/ai_config.hpp +++ b/src/ai/ai_config.hpp @@ -61,10 +61,18 @@ public: */ const AIConfigItemList *GetConfigList(); + /* Where to get the config from, either default (depends on current game + * mode) or force either newgame or normal */ + enum AISettingSource { + AISS_DEFAULT, ///< Get the AI config from the current game mode + AISS_FORCE_NEWGAME, ///< Get the newgame AI config + AISS_FORCE_GAME, ///< Get the AI config from the current game + }; + /** * Get the config of a company. */ - static AIConfig *GetConfig(CompanyID company, bool forceNewgameSetting = false); + static AIConfig *GetConfig(CompanyID company, AISettingSource source = AISS_DEFAULT); /** * Get the value of a setting for this config. It might fallback to his |