From b9192bdc4cc56f9d5e046766ca3d589d7cb6ad4d Mon Sep 17 00:00:00 2001 From: truebrain Date: Wed, 23 Nov 2011 18:55:13 +0000 Subject: (svn r23310) -Fix: Town GUI was not representing the true conditions of arctic / tropical goals --- src/town_gui.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/town_gui.cpp') 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; -- cgit v1.2.3-54-g00ecf