Mercurial > hg > openttd
changeset 8461:740ea25209ab draft
(svn r12031) -Fix [FS#1689,FS#1719]: Prevent towns from removing or claiming ownership of player owned tiles when growing.
| author | peter1138 <peter1138@openttd.org> |
|---|---|
| date | Thu, 31 Jan 2008 21:16:40 +0000 |
| parents | e5fda6729a91 |
| children | 2824c1ca7461 |
| files | src/town_cmd.cpp src/unmovable_cmd.cpp |
| diffstat | 2 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/town_cmd.cpp +++ b/src/town_cmd.cpp @@ -1189,7 +1189,7 @@ /* Don't allow building over roads of other cities */ if (IsTileOwner(tile, OWNER_TOWN) && GetTownByTile(tile) != t) { _grow_town_result = GROWTH_SUCCEED; - } else if (_game_mode == GM_EDITOR) { + } else if (IsTileOwner(tile, OWNER_NONE) && _game_mode == GM_EDITOR) { /* If we are in the SE, and this road-piece has no town owner yet, it just found an * owner :) (happy happy happy road now) */ SetTileOwner(tile, OWNER_TOWN);
--- a/src/unmovable_cmd.cpp +++ b/src/unmovable_cmd.cpp @@ -264,6 +264,8 @@ return_cmd_error(STR_5800_OBJECT_IN_THE_WAY); if (IsStatue(tile)) { + if (flags & DC_AUTO) return_cmd_error(STR_5800_OBJECT_IN_THE_WAY); + TownID town = GetStatueTownID(tile); ClrBit(GetTown(town)->statues, _current_player); InvalidateWindow(WC_TOWN_AUTHORITY, town);