Mercurial > hg > openttd

changeset 9497:5069f9e0b799 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r13477) -Fix (r13464): correct tile type in the Query tile info window
author smatz <smatz@openttd.org>
date Wed, 11 Jun 2008 16:24:00 +0000
parents 26305433ddc6
children 40e86605638d
files src/lang/english.txt src/tunnelbridge_cmd.cpp
diffstat 2 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -1943,6 +1943,7 @@
 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
 
--- a/src/tunnelbridge_cmd.cpp
+++ b/src/tunnelbridge_cmd.cpp
@@ -1204,11 +1204,12 @@
 
 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);
 }