# HG changeset patch # User smatz # Date 2008-06-11 16:24:00 # Node ID a6ff3c8ecdf5bbecd6a27ae55db80721cf2d938b # Parent d6293d3ad201e87c67432a7bf44e905abc3c6cb1 (svn r13477) -Fix (r13464): correct tile type in the Query tile info window diff --git a/src/lang/english.txt b/src/lang/english.txt --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -1943,6 +1943,7 @@ STR_3803_SELECT_SHIP_DEPOT_ORIENTATION 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 --- a/src/tunnelbridge_cmd.cpp +++ b/src/tunnelbridge_cmd.cpp @@ -1204,11 +1204,12 @@ static void GetAcceptedCargo_TunnelBridg 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); }