Mercurial > hg > openttd
changeset 18265:c45ee8c2b36b draft
(svn r23101) -Codechange: remove pointless multiplications by TILE_HEIGHT from the station/object building code
author | rubidium <rubidium@openttd.org> |
---|---|
date | Fri, 04 Nov 2011 10:31:13 +0000 |
parents | e33480209002 |
children | 4fb3f7ce4ea9 |
files | src/object_cmd.cpp src/station_cmd.cpp src/town_cmd.cpp |
diffstat | 3 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/object_cmd.cpp +++ b/src/object_cmd.cpp @@ -230,7 +230,7 @@ /* So, now the surface is checked... check the slope of said surface. */ int allowed_z; - if (GetTilePixelSlope(tile, (uint*)&allowed_z) != SLOPE_FLAT) allowed_z += TILE_HEIGHT; + if (GetTileSlope(tile, (uint*)&allowed_z) != SLOPE_FLAT) allowed_z++; TILE_AREA_LOOP(t, ta) { uint16 callback = CALLBACK_FAILED; @@ -643,7 +643,7 @@ TileIndex tile = RandomTile(); uint h; - if (IsTileType(tile, MP_CLEAR) && GetTilePixelSlope(tile, &h) == SLOPE_FLAT && h >= TILE_HEIGHT * 4 && !IsBridgeAbove(tile)) { + if (IsTileType(tile, MP_CLEAR) && GetTileSlope(tile, &h) == SLOPE_FLAT && h >= 4 && !IsBridgeAbove(tile)) { TileIndex t = tile; if (CircularTileSearch(&t, 9, HasTransmitter, NULL)) continue; @@ -680,7 +680,7 @@ for (int j = 0; j < 19; j++) { uint h; - if (IsTileType(tile, MP_CLEAR) && GetTilePixelSlope(tile, &h) == SLOPE_FLAT && h <= TILE_HEIGHT * 2 && !IsBridgeAbove(tile)) { + if (IsTileType(tile, MP_CLEAR) && GetTileSlope(tile, &h) == SLOPE_FLAT && h <= 2 && !IsBridgeAbove(tile)) { BuildObject(OBJECT_LIGHTHOUSE, tile); IncreaseGeneratingWorldProgress(GWP_OBJECT); lighthouses_to_build--;
--- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -306,8 +306,8 @@ } /* check elevation compared to town */ - uint z = GetTilePixelZ(tile); - uint z2 = GetTilePixelZ(t->xy); + uint z = GetTileZ(tile); + uint z2 = GetTileZ(t->xy); if (z < z2) { if (HasBit(free_names, M(STR_SV_STNAME_VALLEY))) return STR_SV_STNAME_VALLEY; } else if (z > z2) { @@ -665,7 +665,7 @@ if (ret.Failed()) return ret; uint z; - Slope tileh = GetTilePixelSlope(tile, &z); + Slope tileh = GetTileSlope(tile, &z); /* Prohibit building if * 1) The tile is "steep" (i.e. stretches two height levels). @@ -677,7 +677,7 @@ } CommandCost cost(EXPENSES_CONSTRUCTION); - int flat_z = z + GetSlopeMaxPixelZ(tileh); + int flat_z = z + GetSlopeMaxZ(tileh); if (tileh != SLOPE_FLAT) { /* Forbid building if the tile faces a slope in a invalid direction. */ for (DiagDirection dir = DIAGDIR_BEGIN; dir != DIAGDIR_END; dir++) {
--- a/src/town_cmd.cpp +++ b/src/town_cmd.cpp @@ -1935,7 +1935,7 @@ if (!CanBuildHouseHere(tile, town, noslope)) return false; /* if building on slopes is allowed, there will be flattening foundation (to tile max z) */ - if (GetTileMaxPixelZ(tile) != z) return false; + if (GetTileMaxZ(tile) != z) return false; return true; } @@ -2139,7 +2139,7 @@ houses[num++] = (HouseID)i; } - uint maxz = GetTileMaxPixelZ(tile); + uint maxz = GetTileMaxZ(tile); TileIndex baseTile = tile; while (probability_max > 0) {