summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortruebrain <truebrain@openttd.org>2011-11-23 18:55:13 +0000
committertruebrain <truebrain@openttd.org>2011-11-23 18:55:13 +0000
commitb9192bdc4cc56f9d5e046766ca3d589d7cb6ad4d (patch)
tree0a70e99b1933aa128ef38904b024af5b823cfa5a /src
parentbd3fd1171ebc58751b06c9f93ec3ad38878786b8 (diff)
downloadopenttd-b9192bdc4cc56f9d5e046766ca3d589d7cb6ad4d.tar.xz
(svn r23310) -Fix: Town GUI was not representing the true conditions of arctic / tropical goals
Diffstat (limited to 'src')
-rw-r--r--src/town_gui.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/town_gui.cpp b/src/town_gui.cpp
index 1ec5df500..f5c6747bf 100644
--- a/src/town_gui.cpp
+++ b/src/town_gui.cpp
@@ -365,7 +365,8 @@ public:
bool first = true;
for (int i = TE_BEGIN; i < TE_END; i++) {
if (this->town->goal[i] == 0) continue;
- if (this->town->goal[i] == TOWN_GROWTH_WINTER && TileHeight(this->town->xy) < LowestSnowLine()) continue;
+ if (this->town->goal[i] == TOWN_GROWTH_WINTER && (TileHeight(this->town->xy) < LowestSnowLine() || this->town->population <= 90)) continue;
+ if (this->town->goal[i] == TOWN_GROWTH_DESERT && (GetTropicZone(this->town->xy) != TROPICZONE_DESERT || this->town->population <= 60)) continue;
if (first) {
DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_LEFT, y += FONT_HEIGHT_NORMAL, STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH);
@@ -481,6 +482,9 @@ public:
bool first = true;
for (int i = TE_BEGIN; i < TE_END; i++) {
if (this->town->goal[i] == 0) continue;
+ if (this->town->goal[i] == TOWN_GROWTH_WINTER && (TileHeight(this->town->xy) < LowestSnowLine() || this->town->population <= 90)) continue;
+ if (this->town->goal[i] == TOWN_GROWTH_DESERT && (GetTropicZone(this->town->xy) != TROPICZONE_DESERT || this->town->population <= 60)) continue;
+
if (first) {
aimed_height += FONT_HEIGHT_NORMAL;
first = false;