diff options
| author | smatz <smatz@openttd.org> | 2007-12-16 15:38:51 +0000 |
|---|---|---|
| committer | smatz <smatz@openttd.org> | 2007-12-16 15:38:51 +0000 |
| commit | 926fe5c9e9e9fc3fd1b8ed9779812d54ee128adf (patch) | |
| tree | 3adebd2b8c9a10a6d993c67b0b5920b3598f2bce /src/train_cmd.cpp | |
| parent | 8ce9c5f29b52cc9625bdda47594b4fad9e3dd242 (diff) | |
| download | openttd-926fe5c9e9e9fc3fd1b8ed9779812d54ee128adf.tar.xz | |
(svn r11644) -Codechange: merge some functions from tunnel_map.h and bridge_map.h into tunnelbridge_map.h
Diffstat (limited to 'src/train_cmd.cpp')
| -rw-r--r-- | src/train_cmd.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index 8264b0fa3..a3f551ec7 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -42,6 +42,8 @@ #include "cargotype.h" #include "group.h" #include "table/sprites.h" +#include "tunnelbridge_map.h" + static bool TrainCheckIfLineEnds(Vehicle *v); static void TrainController(Vehicle *v, bool update_image); @@ -3057,7 +3059,7 @@ static void DeleteLastWagon(Vehicle *v) if (GetVehicleTunnelBridge(v->tile, endtile) != NULL) return; // tunnel / bridge is busy - DiagDirection dir = IsTunnel(v->tile) ? GetTunnelDirection(v->tile) : GetBridgeRampDirection(v->tile); + DiagDirection dir = IsTunnel(v->tile) ? GetTunnelBridgeDirection(v->tile) : GetTunnelBridgeDirection(v->tile); /* v->direction is "random", so it cannot be used to determine the direction of the track */ UpdateSignalsOnSegment(v->tile, dir); @@ -3174,7 +3176,7 @@ static bool TrainCheckIfLineEnds(Vehicle *v) TileIndex tile = v->tile; if (IsTileType(tile, MP_TUNNELBRIDGE)) { - DiagDirection dir = IsTunnel(tile) ? GetTunnelDirection(tile) : GetBridgeRampDirection(tile); + DiagDirection dir = IsTunnel(tile) ? GetTunnelBridgeDirection(tile) : GetTunnelBridgeDirection(tile); if (DiagDirToDir(dir) == v->direction) return true; } |