diff options
| author | rubidium <rubidium@openttd.org> | 2011-11-04 10:22:27 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2011-11-04 10:22:27 +0000 |
| commit | 2ed0f93bfbd27ba4b4dc3e590556ffae6d9b9338 (patch) | |
| tree | 9086d7e7b83871e60d43d838fd5f005ef50c5063 /src/station_cmd.cpp | |
| parent | a36551dbb4a6aa8a10e99df8331ac4ecb8586270 (diff) | |
| download | openttd-2ed0f93bfbd27ba4b4dc3e590556ffae6d9b9338.tar.xz | |
(svn r23093) -Codechange: add a default NULL for the Z of GetTileSlope and use it
Diffstat (limited to 'src/station_cmd.cpp')
| -rw-r--r-- | src/station_cmd.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index fb7607156..6a5e557e2 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -2347,7 +2347,7 @@ CommandCost CmdBuildDock(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 if (distant_join && (!_settings_game.station.distant_join_stations || !Station::IsValidID(station_to_join))) return CMD_ERROR; - DiagDirection direction = GetInclinedSlopeDirection(GetTilePixelSlope(tile, NULL)); + DiagDirection direction = GetInclinedSlopeDirection(GetTileSlope(tile)); if (direction == INVALID_DIAGDIR) return_cmd_error(STR_ERROR_SITE_UNSUITABLE); direction = ReverseDiagDir(direction); @@ -2364,7 +2364,7 @@ CommandCost CmdBuildDock(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 TileIndex tile_cur = tile + TileOffsByDiagDir(direction); - if (!IsTileType(tile_cur, MP_WATER) || GetTilePixelSlope(tile_cur, NULL) != SLOPE_FLAT) { + if (!IsTileType(tile_cur, MP_WATER) || GetTileSlope(tile_cur) != SLOPE_FLAT) { return_cmd_error(STR_ERROR_SITE_UNSUITABLE); } @@ -2377,7 +2377,7 @@ CommandCost CmdBuildDock(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 if (ret.Failed()) return ret; tile_cur += TileOffsByDiagDir(direction); - if (!IsTileType(tile_cur, MP_WATER) || GetTilePixelSlope(tile_cur, NULL) != SLOPE_FLAT) { + if (!IsTileType(tile_cur, MP_WATER) || GetTileSlope(tile_cur) != SLOPE_FLAT) { return_cmd_error(STR_ERROR_SITE_UNSUITABLE); } @@ -2898,7 +2898,7 @@ static void TileLoop_Station(TileIndex tile) break; case STATION_DOCK: - if (GetTilePixelSlope(tile, NULL) != SLOPE_FLAT) break; // only handle water part + if (GetTileSlope(tile) != SLOPE_FLAT) break; // only handle water part /* FALL THROUGH */ case STATION_OILRIG: //(station part) case STATION_BUOY: |