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 /tunnelbridge_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 'tunnelbridge_cmd.c')
-rw-r--r-- | tunnelbridge_cmd.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tunnelbridge_cmd.c b/tunnelbridge_cmd.c index 828210f2c..e16e1f4d7 100644 --- a/tunnelbridge_cmd.c +++ b/tunnelbridge_cmd.c @@ -471,7 +471,7 @@ int32 CmdBuildTunnel(TileIndex start_tile, uint32 flags, uint32 p1, uint32 p2) * cost before the loop will yield different costs depending on start- * position, because of increased-cost-by-length: 'cost += cost >> 3' */ cost = 0; - delta = TileOffsByDir(direction); + delta = TileOffsByDiagDir(direction); end_tile = start_tile; for (;;) { end_tile += delta; @@ -523,7 +523,7 @@ TileIndex CheckTunnelBusy(TileIndex tile, uint *length) { uint z = GetTileZ(tile); DiagDirection dir = GetTunnelDirection(tile); - TileIndexDiff delta = TileOffsByDir(dir); + TileIndexDiff delta = TileOffsByDiagDir(dir); uint len = 0; TileIndex starttile = tile; Vehicle *v; @@ -670,7 +670,7 @@ static int32 DoClearBridge(TileIndex tile, uint32 flags) if (!EnsureNoVehicle(tile) || !EnsureNoVehicle(endtile)) return CMD_ERROR; direction = GetBridgeRampDirection(tile); - delta = TileOffsByDir(direction); + delta = TileOffsByDiagDir(direction); /* Make sure there's no vehicle on the bridge * Omit tile and endtile, since these are already checked, thus solving the @@ -823,7 +823,7 @@ int32 DoConvertTunnelBridgeRail(TileIndex tile, RailType totype, bool exec) YapfNotifyTrackLayoutChange(endtile, track); } cost = 2 * (_price.build_rail >> 1); - delta = TileOffsByDir(GetBridgeRampDirection(tile)); + delta = TileOffsByDiagDir(GetBridgeRampDirection(tile)); for (tile += delta; tile != endtile; tile += delta) { if (exec) { SetRailTypeOnBridge(tile, totype); @@ -1437,7 +1437,7 @@ TileIndex GetVehicleOutOfTunnelTile(const Vehicle *v) #else TileIndex tile = v->tile; DiagDirection dir = DirToDiagDir(v->direction); - TileIndexDiff delta = TileOffsByDir(dir); + TileIndexDiff delta = TileOffsByDiagDir(dir); byte z = v->z_pos; dir = ReverseDiagDir(dir); |