diff options
| author | tron <tron@openttd.org> | 2005-11-16 11:52:21 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2005-11-16 11:52:21 +0000 |
| commit | 1806293e465800e056ba78b6ffc5de80a0161afb (patch) | |
| tree | 21dd2488322444c1a42a2123ab3a7000b0b141b5 | |
| parent | 62b2b4613f431d08328299bf6a6316988ccfadfa (diff) | |
| download | openttd-1806293e465800e056ba78b6ffc5de80a0161afb.tar.xz | |
(svn r3194) Don't use FindLandscapeHeightByTile() when it's overkill
| -rw-r--r-- | main_gui.c | 12 | ||||
| -rw-r--r-- | water_cmd.c | 7 |
2 files changed, 8 insertions, 11 deletions
diff --git a/main_gui.c b/main_gui.c index cac653495..c3c8277ad 100644 --- a/main_gui.c +++ b/main_gui.c @@ -1200,11 +1200,9 @@ static void PlaceProc_RockyArea(TileIndex tile) static void PlaceProc_LightHouse(TileIndex tile) { - TileInfo ti; - - FindLandscapeHeightByTile(&ti, tile); - if (!IsTileType(tile, MP_CLEAR) || IsSteepTileh(ti.tileh)) + if (!IsTileType(tile, MP_CLEAR) || IsSteepTileh(GetTileSlope(tile, NULL))) { return; + } ModifyTile(tile, MP_SETTYPE(MP_UNMOVABLE) | MP_MAP5, 1); SndPlayTileFx(SND_1F_SPLAT, tile); @@ -1212,11 +1210,9 @@ static void PlaceProc_LightHouse(TileIndex tile) static void PlaceProc_Transmitter(TileIndex tile) { - TileInfo ti; - - FindLandscapeHeightByTile(&ti, tile); - if (!IsTileType(tile, MP_CLEAR) || IsSteepTileh(ti.tileh)) + if (!IsTileType(tile, MP_CLEAR) || IsSteepTileh(GetTileSlope(tile, NULL))) { return; + } ModifyTile(tile, MP_SETTYPE(MP_UNMOVABLE) | MP_MAP5, 0); SndPlayTileFx(SND_1F_SPLAT, tile); diff --git a/water_cmd.c b/water_cmd.c index 3a5c3924e..fcfa4211b 100644 --- a/water_cmd.c +++ b/water_cmd.c @@ -39,9 +39,10 @@ static void FloodVehicle(Vehicle *v); static bool IsClearWaterTile(TileIndex tile) { - TileInfo ti; - FindLandscapeHeightByTile(&ti, tile); - return (ti.type == MP_WATER && ti.tileh == 0 && ti.map5 == 0); + return + IsTileType(tile, MP_WATER) && + _m[tile].m5 == 0 && + GetTileSlope(tile, NULL) == 0; } /** Build a ship depot. |