diff options
| author | frosch <frosch@openttd.org> | 2009-11-24 17:56:45 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2009-11-24 17:56:45 +0000 |
| commit | 91865c33da8df050165d8e692e22dde9048572ed (patch) | |
| tree | 1e13e83f2948bf07afe02634ab664e357320af26 | |
| parent | 7d355a58f3be09cfdacdd1ecf5269604da0de9e6 (diff) | |
| download | openttd-91865c33da8df050165d8e692e22dde9048572ed.tar.xz | |
(svn r18276) -Fix: [NoAI] Make AIIndustryType::GetConstructionCost() return -1, if the industry is neither buildable nor prospectable.
| -rw-r--r-- | bin/ai/regression/regression.txt | 12 | ||||
| -rw-r--r-- | src/ai/api/ai_industrytype.cpp | 3 |
2 files changed, 8 insertions, 7 deletions
diff --git a/bin/ai/regression/regression.txt b/bin/ai/regression/regression.txt index 2a60fd8de..4b70aa11e 100644 --- a/bin/ai/regression/regression.txt +++ b/bin/ai/regression/regression.txt @@ -6934,7 +6934,7 @@ Id: 9 IsRawIndustry(): true ProductionCanIncrease(): true - GetConstructionCost(): 747070 + GetConstructionCost(): -1 GetName(): Farm CanBuildIndustry(): false CanProspectIndustry(): false @@ -6944,7 +6944,7 @@ Id: 5 IsRawIndustry(): true ProductionCanIncrease(): true - GetConstructionCost(): 747070 + GetConstructionCost(): -1 GetName(): Oil Rig CanBuildIndustry(): false CanProspectIndustry(): false @@ -6964,7 +6964,7 @@ Id: 11 IsRawIndustry(): true ProductionCanIncrease(): false - GetConstructionCost(): 747070 + GetConstructionCost(): -1 GetName(): Oil Wells CanBuildIndustry(): false CanProspectIndustry(): false @@ -6984,7 +6984,7 @@ Id: 3 IsRawIndustry(): true ProductionCanIncrease(): true - GetConstructionCost(): 747070 + GetConstructionCost(): -1 GetName(): Forest CanBuildIndustry(): false CanProspectIndustry(): false @@ -7004,7 +7004,7 @@ Id: 18 IsRawIndustry(): true ProductionCanIncrease(): true - GetConstructionCost(): 747070 + GetConstructionCost(): -1 GetName(): Iron Ore Mine CanBuildIndustry(): false CanProspectIndustry(): false @@ -7014,7 +7014,7 @@ Id: 0 IsRawIndustry(): true ProductionCanIncrease(): true - GetConstructionCost(): 747070 + GetConstructionCost(): -1 GetName(): Coal Mine CanBuildIndustry(): false CanProspectIndustry(): false diff --git a/src/ai/api/ai_industrytype.cpp b/src/ai/api/ai_industrytype.cpp index 1f2084565..8bf892c8e 100644 --- a/src/ai/api/ai_industrytype.cpp +++ b/src/ai/api/ai_industrytype.cpp @@ -39,7 +39,8 @@ /* static */ Money AIIndustryType::GetConstructionCost(IndustryType industry_type) { - if (!IsValidIndustryType(industry_type)) return false; + if (!IsValidIndustryType(industry_type)) return -1; + if (::GetIndustrySpec(industry_type)->IsRawIndustry() && _settings_game.construction.raw_industry_construction == 0) return -1; return ::GetIndustrySpec(industry_type)->GetConstructionCost(); } |