diff options
| author | smatz <smatz@openttd.org> | 2007-12-16 19:30:42 +0000 |
|---|---|---|
| committer | smatz <smatz@openttd.org> | 2007-12-16 19:30:42 +0000 |
| commit | 145517fb8e0bbd66daa711ca2b31aecc0179fe74 (patch) | |
| tree | 3d93af5bbe577ea3e66b1184cb89c1a934d6bcda /src/roadveh_cmd.cpp | |
| parent | 0730b9afc135eabce02144e2928b86cfa0b7f95e (diff) | |
| download | openttd-145517fb8e0bbd66daa711ca2b31aecc0179fe74.tar.xz | |
(svn r11649) -Codechange: some code can be simplified thanks to changes in r11642
Diffstat (limited to 'src/roadveh_cmd.cpp')
| -rw-r--r-- | src/roadveh_cmd.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp index 2850b2d7c..d9cdeb4d3 100644 --- a/src/roadveh_cmd.cpp +++ b/src/roadveh_cmd.cpp @@ -551,8 +551,7 @@ CommandCost CmdTurnRoadVeh(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) if (IsTileType(v->tile, MP_ROAD) && GetRoadTileType(v->tile) == ROAD_TILE_NORMAL && GetDisallowedRoadDirections(v->tile) != DRD_NONE) return CMD_ERROR; - if (IsTunnelTile(v->tile) && DirToDiagDir(v->direction) == GetTunnelBridgeDirection(v->tile)) return CMD_ERROR; - if (IsBridgeTile(v->tile) && DirToDiagDir(v->direction) == GetTunnelBridgeDirection(v->tile)) return CMD_ERROR; + if (IsTileType(v->tile, MP_TUNNELBRIDGE) && DirToDiagDir(v->direction) == GetTunnelBridgeDirection(v->tile)) return CMD_ERROR; if (flags & DC_EXEC) v->u.road.reverse_ctr = 180; @@ -1407,9 +1406,7 @@ static Trackdir FollowPreviousRoadVehicle(const Vehicle *v, const Vehicle *prev, if (prev_state == RVSB_WORMHOLE || prev_state == RVSB_IN_DEPOT) { DiagDirection diag_dir = INVALID_DIAGDIR; - if (IsTunnelTile(tile)) { - diag_dir = GetTunnelBridgeDirection(tile); - } else if (IsBridgeTile(tile)) { + if (IsTileType(tile, MP_TUNNELBRIDGE)) { diag_dir = GetTunnelBridgeDirection(tile); } else if (IsTileType(tile, MP_ROAD) && GetRoadTileType(tile) == ROAD_TILE_DEPOT) { diag_dir = ReverseDiagDir(GetRoadDepotDirection(tile)); |