mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r15683) -Fix (r15670): Removing town-owned bridges was no longer possible.

release/0.7
yexo 2009-03-12 11:36:18 +00:00
parent 84e5e44ca9
commit 9eef8f77e2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/tunnelbridge_cmd.cpp
View File

@ -594,10 +594,11 @@ static inline bool CheckAllowRemoveTunnelBridge(TileIndex tile)
if (HasBit(rts, ROADTYPE_TRAM)) tram_owner = GetRoadOwner(tile, ROADTYPE_TRAM); if (HasBit(rts, ROADTYPE_TRAM)) tram_owner = GetRoadOwner(tile, ROADTYPE_TRAM);
/* We can remove unowned road and if the town allows it */ /* 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; 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: case TRANSPORT_RAIL: