From 3cee0abdbaf6c867ca71fec4700823f545556936 Mon Sep 17 00:00:00 2001 From: smatz Date: Sun, 16 Dec 2007 15:38:51 +0000 Subject: (svn r11644) -Codechange: merge some functions from tunnel_map.h and bridge_map.h into tunnelbridge_map.h --- src/rail.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/rail.cpp') diff --git a/src/rail.cpp b/src/rail.cpp index 8bf83a36a..f3f62175f 100644 --- a/src/rail.cpp +++ b/src/rail.cpp @@ -8,6 +8,8 @@ #include "rail.h" #include "station_map.h" #include "tunnel_map.h" +#include "tunnelbridge_map.h" + /* XXX: Below 3 tables store duplicate data. Maybe remove some? */ /* Maps a trackdir to the bit that stores its status in the map arrays, in the @@ -131,9 +133,9 @@ RailType GetTileRailType(TileIndex tile) case MP_TUNNELBRIDGE: if (IsTunnel(tile)) { - if (GetTunnelTransportType(tile) == TRANSPORT_RAIL) return GetRailType(tile); + if (GetTunnelBridgeTransportType(tile) == TRANSPORT_RAIL) return GetRailType(tile); } else { - if (GetBridgeTransportType(tile) == TRANSPORT_RAIL) return GetRailType(tile); + if (GetTunnelBridgeTransportType(tile) == TRANSPORT_RAIL) return GetRailType(tile); } break; -- cgit v1.2.3-54-g00ecf