summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpasky <pasky@openttd.org>2004-11-20 02:36:10 +0000
committerpasky <pasky@openttd.org>2004-11-20 02:36:10 +0000
commit578bde9aaef23287b43286878ea9c54b873e362c (patch)
tree2dc3df8fe3d51b0c83cd690705056d8f9b325965
parente1c1036648f827da88301468ab56280a4a1e03ea (diff)
downloadopenttd-578bde9aaef23287b43286878ea9c54b873e362c.tar.xz
(svn r698) Merge a town growth fix from TTDPatch - in arctic and desert climate, require food (and possibly water) only if the population is more than 90, so that the town gets chance to actually accept it. (By Marcin?)
-rw-r--r--town_cmd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/town_cmd.c b/town_cmd.c
index 50e18dc96..add337060 100644
--- a/town_cmd.c
+++ b/town_cmd.c
@@ -1612,10 +1612,10 @@ static void UpdateTownGrowRate(Town *t)
}
if (_opt.landscape == LT_HILLY) {
- if (GET_TILEHEIGHT(t->xy) >= _opt.snow_line && t->act_food == 0)
+ if (GET_TILEHEIGHT(t->xy) >= _opt.snow_line && t->act_food == 0 && t->population > 90)
return;
} else if (_opt.landscape == LT_DESERT) {
- if (GetMapExtraBits(t->xy) == 1 && (t->act_food==0 || t->act_water==0))
+ if (GetMapExtraBits(t->xy) == 1 && (t->act_food==0 || t->act_water==0) && t->population > 60)
return;
}