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

Fix #7151: AI start date deviation was still applied when not set to a random AI. (#7223)

pull/7243/head
PeterN 2019-02-11 18:59:55 +00:00 committed by GitHub
parent 75d3054ae4
commit aa737715dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/ai/ai_config.cpp
View File

@ -35,6 +35,15 @@ ScriptConfigItem _start_date_config = {
false false
}; };
AIConfig::AIConfig(const AIConfig *config) : ScriptConfig(config)
{
/* Override start_date as per AIConfig::AddRandomDeviation().
* This is necessary because the ScriptConfig constructor will instead call
* ScriptConfig::AddRandomDeviation(). */
int start_date = config->GetSetting("start_date");
this->SetSetting("start_date", start_date != 0 ? max(1, this->GetSetting("start_date")) : 0);
}
/* static */ AIConfig *AIConfig::GetConfig(CompanyID company, ScriptSettingSource source) /* static */ AIConfig *AIConfig::GetConfig(CompanyID company, ScriptSettingSource source)
{ {
AIConfig **config; AIConfig **config;

4
src/ai/ai_config.hpp
View File

@ -26,9 +26,7 @@ public:
ScriptConfig() ScriptConfig()
{} {}
AIConfig(const AIConfig *config) : AIConfig(const AIConfig *config);
ScriptConfig(config)
{}
class AIInfo *GetInfo() const; class AIInfo *GetInfo() const;