diff options
| author | Darkvater <darkvater@openttd.org> | 2006-09-05 23:21:41 +0000 |
|---|---|---|
| committer | Darkvater <darkvater@openttd.org> | 2006-09-05 23:21:41 +0000 |
| commit | 80814dbb1d01f651ba7c60547dc1b52c1c209378 (patch) | |
| tree | f2f14fca9ac095b0bf6b46615035b8c207e3ce66 /station_cmd.c | |
| parent | 516d412a77de7fb3d2278515d59a0c46bb9b461b (diff) | |
| download | openttd-80814dbb1d01f651ba7c60547dc1b52c1c209378.tar.xz | |
(svn r6406) -Codechange: Rename TileOffsByDir to TileOffsByDiagDir because it accepts
DiagDirections, and add TileOffsByDir that handles Directions.
-Codechange: Make the treeloop use TileOffsByDir().
Diffstat (limited to 'station_cmd.c')
| -rw-r--r-- | station_cmd.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/station_cmd.c b/station_cmd.c index 6ba147164..87722d195 100644 --- a/station_cmd.c +++ b/station_cmd.c @@ -1265,7 +1265,7 @@ uint GetPlatformLength(TileIndex tile, DiagDirection dir) do { length ++; - tile += TileOffsByDir(dir); + tile += TileOffsByDiagDir(dir); } while (IsCompatibleTrainStationTile(tile, start_tile)); return length; @@ -1923,7 +1923,7 @@ int32 CmdBuildDock(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) cost = DoCommand(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR); if (CmdFailed(cost)) return CMD_ERROR; - tile_cur = tile + TileOffsByDir(direction); + tile_cur = tile + TileOffsByDiagDir(direction); if (!EnsureNoVehicle(tile_cur)) return CMD_ERROR; @@ -1934,7 +1934,7 @@ int32 CmdBuildDock(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) cost = DoCommand(tile_cur, 0, 0, flags, CMD_LANDSCAPE_CLEAR); if (CmdFailed(cost)) return CMD_ERROR; - tile_cur += TileOffsByDir(direction); + tile_cur += TileOffsByDiagDir(direction); if (!IsTileType(tile_cur, MP_WATER) || GetTileSlope(tile_cur, NULL) != SLOPE_FLAT) { return_cmd_error(STR_304B_SITE_UNSUITABLE); } @@ -2002,7 +2002,7 @@ static int32 RemoveDock(Station *st, uint32 flags) if (!CheckOwnership(st->owner)) return CMD_ERROR; tile1 = st->dock_tile; - tile2 = tile1 + TileOffsByDir(GetDockDirection(tile1)); + tile2 = tile1 + TileOffsByDiagDir(GetDockDirection(tile1)); if (!EnsureNoVehicle(tile1)) return CMD_ERROR; if (!EnsureNoVehicle(tile2)) return CMD_ERROR; @@ -2284,7 +2284,7 @@ static uint32 VehicleEnter_Station(Vehicle *v, TileIndex tile, int x, int y) { if (v->type == VEH_Train) { if (IsRailwayStation(tile) && IsFrontEngine(v) && - !IsCompatibleTrainStationTile(tile + TileOffsByDir(DirToDiagDir(v->direction)), tile)) { + !IsCompatibleTrainStationTile(tile + TileOffsByDiagDir(DirToDiagDir(v->direction)), tile)) { StationID station_id = GetStationIndex(tile); if ((!(v->current_order.flags & OF_NON_STOP) && !_patches.new_nonstop) || |