Mercurial > hg > openttd

changeset 18012:ab5d1e04c521 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r22821) -Fix [FS#4741]: Allow to demolish aqueducts built in the scenario editor.
author terkhen <terkhen@openttd.org>
date Wed, 24 Aug 2011 12:19:12 +0000
parents 9243bb1fc073
children 7a582ee01092
files src/tunnelbridge_cmd.cpp
diffstat 1 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/tunnelbridge_cmd.cpp
+++ b/src/tunnelbridge_cmd.cpp
@@ -673,9 +673,15 @@
 		}
 
 		case TRANSPORT_RAIL:
-		case TRANSPORT_WATER:
 			return CheckOwnership(GetTileOwner(tile));
 
+		case TRANSPORT_WATER: {
+			/* Always allow to remove aqueducts without owner. */
+			Owner aqueduct_owner = GetTileOwner(tile);
+			if (aqueduct_owner == OWNER_NONE) aqueduct_owner = _current_company;
+			return CheckOwnership(aqueduct_owner);
+		}
+
 		default: NOT_REACHED();
 	}
 }