From 9eef8f77e2ed4a8fe297b70feb69cf311b906a91 Mon Sep 17 00:00:00 2001 From: yexo Date: Thu, 12 Mar 2009 11:36:18 +0000 Subject: (svn r15683) -Fix (r15670): Removing town-owned bridges was no longer possible. --- src/tunnelbridge_cmd.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/tunnelbridge_cmd.cpp') diff --git a/src/tunnelbridge_cmd.cpp b/src/tunnelbridge_cmd.cpp index 566239730..c7f779870 100644 --- a/src/tunnelbridge_cmd.cpp +++ b/src/tunnelbridge_cmd.cpp @@ -594,10 +594,11 @@ static inline bool CheckAllowRemoveTunnelBridge(TileIndex tile) if (HasBit(rts, ROADTYPE_TRAM)) tram_owner = GetRoadOwner(tile, ROADTYPE_TRAM); /* We can remove unowned road and if the town allows it */ - if (road_owner == OWNER_NONE || (road_owner == OWNER_TOWN && (_settings_game.construction.extra_dynamite || _cheats.magic_bulldozer.value))) road_owner = _current_company; + if (road_owner == OWNER_TOWN && !(_settings_game.construction.extra_dynamite || _cheats.magic_bulldozer.value)) return CheckTileOwnership(tile); + if (road_owner == OWNER_NONE || road_owner == OWNER_TOWN) road_owner = _current_company; if (tram_owner == OWNER_NONE) tram_owner = _current_company; - return (GetTileOwner(tile) == OWNER_NONE || CheckTileOwnership(tile)) && CheckOwnership(road_owner) && CheckOwnership(tram_owner); + return CheckOwnership(road_owner) && CheckOwnership(tram_owner); } case TRANSPORT_RAIL: -- cgit v1.2.3-70-g09d2