From 70e4074a4ccb0e6d7f7562bc4454ad616757b975 Mon Sep 17 00:00:00 2001 From: planetmaker Date: Thu, 17 Oct 2013 21:47:16 +0000 Subject: [PATCH] (svn r25879) -Change: Allow to remove unowned objects unless they have the 'unremovable' flag --- src/object_cmd.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/object_cmd.cpp b/src/object_cmd.cpp index 3976a6f6aa..5d4d788c2e 100644 --- a/src/object_cmd.cpp +++ b/src/object_cmd.cpp @@ -486,8 +486,8 @@ static CommandCost ClearTile_Object(TileIndex tile, DoCommandFlag flags) } else if (_game_mode == GM_EDITOR) { /* No further limitations for the editor. */ } else if (GetTileOwner(tile) == OWNER_NONE) { - /* Owned by nobody, so we can only remove it with brute force! */ - if (!_cheats.magic_bulldozer.value) return CMD_ERROR; + /* Owned by nobody and unremovable, so we can only remove it with brute force! */ + if (!_cheats.magic_bulldozer.value && (spec->flags & OBJECT_FLAG_CANNOT_REMOVE) != 0) return CMD_ERROR; } else if (CheckTileOwnership(tile).Failed()) { /* We don't own it!. */ return_cmd_error(STR_ERROR_OWNED_BY);