# HG changeset patch
# User rubidium <rubidium@openttd.org>
# Date 1280786608 0
# Node ID fde87d756a57d1509577766c5229ee74052f530f
# Parent  344b429ff042cb0abadbbb8ea66ee56836083bb4
(svn r20327) -Change: don't let building e.g. road remove light houses and transmitters in the scenario editor

diff --git a/src/unmovable_cmd.cpp b/src/unmovable_cmd.cpp
--- a/src/unmovable_cmd.cpp
+++ b/src/unmovable_cmd.cpp
@@ -286,9 +286,15 @@
 		return DoCommand(tile, 0, 0, flags, CMD_SELL_LAND_AREA);
 	}
 
-	/* checks if you're allowed to remove unmovable things */
-	if (_game_mode != GM_EDITOR && _current_company != OWNER_WATER && ((flags & DC_AUTO) || !_cheats.magic_bulldozer.value)) {
-		return_cmd_error((flags & DC_AUTO) ? STR_ERROR_OBJECT_IN_THE_WAY : INVALID_STRING_ID);
+	/* Water can remove everything! */
+	if (_current_company != OWNER_WATER) {
+		if (flags & DC_AUTO) {
+			/* No automatic removal by overbuilding stuff. */
+			return_cmd_error(STR_ERROR_OBJECT_IN_THE_WAY);
+		} else if (_game_mode != GM_EDITOR && !_cheats.magic_bulldozer.value) {
+			/* In the game editor or with cheats we can remove, otherwise we can't. */
+			return CMD_ERROR;
+		}
 	}
 
 	if (IsStatue(tile)) {