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/openttd.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/openttd.cpp')
| -rw-r--r-- | src/openttd.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/openttd.cpp b/src/openttd.cpp index 7d841f0bb..46f46c594 100644 --- a/src/openttd.cpp +++ b/src/openttd.cpp @@ -77,6 +77,7 @@ #include "industry_map.h" #include "unmovable_map.h" #include "tree_map.h" +#include "tunnelbridge_map.h" #include <stdarg.h> @@ -1639,7 +1640,7 @@ bool AfterLoadGame() case MP_TUNNELBRIDGE: /* Middle part of "old" bridges */ if (old_bridge && IsBridgeTile(t) && HasBit(_m[t].m5, 6)) break; - if ((IsTunnel(t) ? GetTunnelTransportType(t) : (old_bridge ? (TransportType)GB(_m[t].m5, 1, 2) : GetBridgeTransportType(t))) == TRANSPORT_ROAD) { + if ((IsTunnel(t) ? GetTunnelBridgeTransportType(t) : (old_bridge ? (TransportType)GB(_m[t].m5, 1, 2) : GetTunnelBridgeTransportType(t))) == TRANSPORT_ROAD) { SetRoadTypes(t, ROADTYPES_ROAD); } break; @@ -1699,7 +1700,7 @@ bool AfterLoadGame() FOR_ALL_VEHICLES(v) { if (v->type != VEH_TRAIN && v->type != VEH_ROAD) continue; if (IsBridgeTile(v->tile)) { - DiagDirection dir = GetBridgeRampDirection(v->tile); + DiagDirection dir = GetTunnelBridgeDirection(v->tile); if (dir != DirToDiagDir(v->direction)) continue; switch (dir) { @@ -1757,11 +1758,11 @@ bool AfterLoadGame() case MP_TUNNELBRIDGE: if (IsTunnel(t)) { - if (GetTunnelTransportType(t) == TRANSPORT_RAIL) { + if (GetTunnelBridgeTransportType(t) == TRANSPORT_RAIL) { SetRailType(t, UpdateRailType(GetRailType(t), min_rail)); } } else { - if (GetBridgeTransportType(t) == TRANSPORT_RAIL) { + if (GetTunnelBridgeTransportType(t) == TRANSPORT_RAIL) { SetRailType(t, UpdateRailType(GetRailType(t), min_rail)); } } |