summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsmatz <smatz@openttd.org>2008-06-11 16:24:00 +0000
committersmatz <smatz@openttd.org>2008-06-11 16:24:00 +0000
commit881d384e56ed751bc4f525962e3fd6bfff3a20e7 (patch)
treeb64dc2abefcef2306bf83e58abd0051e985f789c /src
parent232a2a8e3cdda4a3b8a6a8904a9afc6251aa6a6e (diff)
downloadopenttd-881d384e56ed751bc4f525962e3fd6bfff3a20e7.tar.xz
(svn r13477) -Fix (r13464): correct tile type in the Query tile info window
Diffstat (limited to 'src')
-rw-r--r--src/lang/english.txt1
-rw-r--r--src/tunnelbridge_cmd.cpp9
2 files changed, 6 insertions, 4 deletions
diff --git a/src/lang/english.txt b/src/lang/english.txt
index 275f581fb..227aba6e9 100644
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -1943,6 +1943,7 @@ STR_3803_SELECT_SHIP_DEPOT_ORIENTATION :{BLACK}Select s
STR_3804_WATER :Water
STR_3805_COAST_OR_RIVERBANK :Coast or riverbank
STR_3806_SHIP_DEPOT :Ship depot
+STR_AQUEDUCT :Aqueduct
STR_3807_CAN_T_BUILD_ON_WATER :{WHITE}...Can't build on water
STR_MUST_DEMOLISH_CANAL_FIRST :{WHITE}Must demolish canal first
diff --git a/src/tunnelbridge_cmd.cpp b/src/tunnelbridge_cmd.cpp
index ada5f3625..db4054282 100644
--- a/src/tunnelbridge_cmd.cpp
+++ b/src/tunnelbridge_cmd.cpp
@@ -1204,11 +1204,12 @@ static void GetAcceptedCargo_TunnelBridge(TileIndex tile, AcceptedCargo ac)
static void GetTileDesc_TunnelBridge(TileIndex tile, TileDesc *td)
{
+ TransportType tt = GetTunnelBridgeTransportType(tile);
+
if (IsTunnel(tile)) {
- td->str = (GetTunnelBridgeTransportType(tile) == TRANSPORT_RAIL) ?
- STR_5017_RAILROAD_TUNNEL : STR_5018_ROAD_TUNNEL;
- } else { //so it must be a bridge
- td->str = GetBridgeSpec(GetBridgeType(tile))->transport_name[GetTunnelBridgeTransportType(tile)];
+ td->str = (tt == TRANSPORT_RAIL) ? STR_5017_RAILROAD_TUNNEL : STR_5018_ROAD_TUNNEL;
+ } else { // IsBridge(tile)
+ td->str = (tt == TRANSPORT_WATER) ? STR_AQUEDUCT : GetBridgeSpec(GetBridgeType(tile))->transport_name[tt];
}
td->owner[0] = GetTileOwner(tile);
}