# HG changeset patch # User rubidium # Date 2009-02-21 21:38:46 # Node ID f993c6adbf598507fc2a1ce8f1ecfcc631693f6f # Parent 69807a5f590533804faa3cc75b69d7dbc660045e (svn r15550) -Fix [FS#2654]: bogus secondary error message when dynamiting industries/unmoveables; "X is in the way" isn't helpful at all in that case. diff --git a/src/industry_cmd.cpp b/src/industry_cmd.cpp --- a/src/industry_cmd.cpp +++ b/src/industry_cmd.cpp @@ -423,7 +423,7 @@ static CommandCost ClearTile_Industry(Ti ((indspec->behaviour & INDUSTRYBEH_BUILT_ONWATER) || HasBit(GetIndustryTileSpec(GetIndustryGfx(tile))->slopes_refused, 5)))) { SetDParam(0, indspec->name); - return_cmd_error(STR_4800_IN_THE_WAY); + return_cmd_error(flags & DC_AUTO ? STR_4800_IN_THE_WAY : INVALID_STRING_ID); } if (flags & DC_EXEC) { diff --git a/src/unmovable_cmd.cpp b/src/unmovable_cmd.cpp --- a/src/unmovable_cmd.cpp +++ b/src/unmovable_cmd.cpp @@ -264,7 +264,7 @@ static CommandCost ClearTile_Unmovable(T if (_current_company == OWNER_WATER) { return DestroyCompanyHQ(GetTileOwner(tile), DC_EXEC); } else { - return_cmd_error(STR_5804_COMPANY_HEADQUARTERS_IN); + return_cmd_error(flags & DC_AUTO ? STR_5804_COMPANY_HEADQUARTERS_IN : INVALID_STRING_ID); } } @@ -274,7 +274,7 @@ static CommandCost ClearTile_Unmovable(T /* 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(STR_5800_OBJECT_IN_THE_WAY); + return_cmd_error(flags & DC_AUTO ? STR_5800_OBJECT_IN_THE_WAY : INVALID_STRING_ID); if (IsStatue(tile)) { if (flags & DC_AUTO) return_cmd_error(STR_5800_OBJECT_IN_THE_WAY);