Mercurial > hg > openttd

changeset 19190:102959356aa1 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r24064) -Fix [FS#5121]: make the full snowedness level of houses the same as roads and rails
author rubidium <rubidium@openttd.org>
date Sun, 25 Mar 2012 18:19:21 +0000
parents a5fe6061fe68
children 631c14db8f5a
files src/town_cmd.cpp
diffstat 1 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/town_cmd.cpp
+++ b/src/town_cmd.cpp
@@ -2171,8 +2171,8 @@
 	/* no house allowed at all, bail out */
 	if (!CanBuildHouseHere(tile, t->index, false)) return false;
 
-	int z;
-	Slope slope = GetTileSlope(tile, &z);
+	Slope slope = GetTileSlope(tile);
+	int maxz = GetTileMaxZ(tile);
 
 	/* Get the town zone type of the current tile, as well as the climate.
 	 * This will allow to easily compare with the specs of the new house to build */
@@ -2180,7 +2180,7 @@
 
 	/* Above snow? */
 	int land = _settings_game.game_creation.landscape;
-	if (land == LT_ARCTIC && z >= HighestSnowLine()) land = -1;
+	if (land == LT_ARCTIC && maxz > HighestSnowLine()) land = -1;
 
 	uint bitmask = (1 << rad) + (1 << (land + 12));
 
@@ -2215,7 +2215,6 @@
 		houses[num++] = (HouseID)i;
 	}
 
-	int maxz = GetTileMaxZ(tile);
 	TileIndex baseTile = tile;
 
 	while (probability_max > 0) {