(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?)

This commit is contained in:
pasky 2004-11-20 02:36:10 +00:00
parent e1c1036648
commit 578bde9aae
1 changed files with 2 additions and 2 deletions

View File

@ -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;
}