Changeset - r11197:f993c6adbf59
[Not reviewed]
master
0 2 0
rubidium - 16 years ago 2009-02-21 21:38:46
rubidium@openttd.org
(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.
2 files changed with 3 insertions and 3 deletions:
0 comments (0 inline, 0 general)
src/industry_cmd.cpp
Show inline comments
 
@@ -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) {
src/unmovable_cmd.cpp
Show inline comments
 
@@ -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);
0 comments (0 inline, 0 general)