diff options
| author | smatz <smatz@openttd.org> | 2009-06-10 22:05:01 +0000 |
|---|---|---|
| committer | smatz <smatz@openttd.org> | 2009-06-10 22:05:01 +0000 |
| commit | bea3fe2b8b2352d471149a4c914f93c58aa11b83 (patch) | |
| tree | 69bd9a4b24333a7da3f2f3d11af4aafff5c92583 /src/newgrf_house.cpp | |
| parent | bc7e9514d247581e085b80a71dabbd6e635e5ded (diff) | |
| download | openttd-bea3fe2b8b2352d471149a4c914f93c58aa11b83.tar.xz | |
(svn r16559) -Codechange: introduce Company::IsValidAiID() and Company::IsValidHumanID(), don't use IsHumanCompany() where possible
Diffstat (limited to 'src/newgrf_house.cpp')
| -rw-r--r-- | src/newgrf_house.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/newgrf_house.cpp b/src/newgrf_house.cpp index f1585f97e..b1e5c64fc 100644 --- a/src/newgrf_house.cpp +++ b/src/newgrf_house.cpp @@ -519,8 +519,9 @@ bool CanDeleteHouse(TileIndex tile) /* Humans are always allowed to remove buildings, as is water and * anyone using the scenario editor. */ - if ((Company::IsValidID(_current_company) && IsHumanCompany(_current_company)) - || _current_company == OWNER_WATER || _current_company == OWNER_NONE) return true; + if (Company::IsValidHumanID(_current_company) || _current_company == OWNER_WATER || _current_company == OWNER_NONE) { + return true; + } if (HasBit(hs->callback_mask, CBM_HOUSE_DENY_DESTRUCTION)) { uint16 callback_res = GetHouseCallback(CBID_HOUSE_DENY_DESTRUCTION, 0, 0, GetHouseType(tile), GetTownByTile(tile), tile); |