Mercurial > hg > openttd
changeset 17030:a9cede836566 draft
(svn r21767) -Fix [FS#4397]: don't limit tile clearing during bankruptcy
| author | rubidium <rubidium@openttd.org> |
|---|---|
| date | Mon, 10 Jan 2011 21:58:05 +0000 |
| parents | aa50a1fe8e5e |
| children | ea551cc125d9 |
| files | src/landscape.cpp |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/landscape.cpp +++ b/src/landscape.cpp @@ -617,7 +617,7 @@ cost.AddCost(GetWaterClass(tile) == WATER_CLASS_CANAL ? _price[PR_CLEAR_CANAL] : _price[PR_CLEAR_WATER]); } - Company *c = (flags & DC_AUTO) ? NULL : Company::GetIfValid(_current_company); + Company *c = (flags & (DC_AUTO | DC_BANKRUPT)) ? NULL : Company::GetIfValid(_current_company); if (c != NULL && (int)GB(c->clear_limit, 16, 16) < 1) { return_cmd_error(STR_ERROR_CLEARING_LIMIT_REACHED); } @@ -665,7 +665,7 @@ CommandCost last_error = CMD_ERROR; bool had_success = false; - const Company *c = (flags & DC_AUTO) ? NULL : Company::GetIfValid(_current_company); + const Company *c = (flags & (DC_AUTO | DC_BANKRUPT)) ? NULL : Company::GetIfValid(_current_company); int limit = (c == NULL ? INT32_MAX : GB(c->clear_limit, 16, 16)); TileArea ta(tile, p1);