mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r19186) -Codechange: Remove use of _error_message from CmdLevelLand().

This commit is contained in:
alberth 2010-02-21 17:02:28 +00:00
parent 82a4d532b6
commit 04087c1bf0
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/terraform_cmd.cpp
View File

@ -376,7 +376,6 @@ CommandCost CmdLevelLand(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
/* Check range of destination height */
if (h > MAX_TILE_HEIGHT) return_cmd_error((oldh == 0) ? STR_ERROR_ALREADY_AT_SEA_LEVEL : STR_ERROR_TOO_HIGH);
if (p2 == 0) _error_message = STR_ERROR_ALREADY_LEVELLED;
Money money = GetAvailableMoneyForCommand();
CommandCost cost(EXPENSES_CONSTRUCTION);
@ -402,5 +401,10 @@ CommandCost CmdLevelLand(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
}
}
return (cost.GetCost() == 0) ? CMD_ERROR : cost;
if (cost.GetCost() == 0) {
if (p2 != 0) return CMD_ERROR;
cost.MakeError(STR_ERROR_ALREADY_LEVELLED);
cost.SetGlobalErrorMessage();
}
return cost;
}