summaryrefslogtreecommitdiff
path: root/src/newgrf_house.cpp
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2008-09-30 20:39:50 +0000
committerrubidium <rubidium@openttd.org>2008-09-30 20:39:50 +0000
commit3b798599b63067c2e92aa49906ea66a07ae8de44 (patch)
tree69fb7ae1d9bdadb9e7386cb70b0a26621ad9b57f /src/newgrf_house.cpp
parentcc1e761edab14f8264dba44d09f7272d931bdd93 (diff)
downloadopenttd-3b798599b63067c2e92aa49906ea66a07ae8de44.tar.xz
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
Diffstat (limited to 'src/newgrf_house.cpp')
-rw-r--r--src/newgrf_house.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/newgrf_house.cpp b/src/newgrf_house.cpp
index 9622588b8..290e358e2 100644
--- a/src/newgrf_house.cpp
+++ b/src/newgrf_house.cpp
@@ -579,10 +579,10 @@ bool CanDeleteHouse(TileIndex tile)
{
const HouseSpec *hs = GetHouseSpecs(GetHouseType(tile));
- /* Human players are always allowed to remove buildings, as is water and
+ /* Humans are always allowed to remove buildings, as is water and
* anyone using the scenario editor. */
- if ((IsValidPlayerID(_current_player) && IsHumanPlayer(_current_player))
- || _current_player == OWNER_WATER || _current_player == OWNER_NONE) return true;
+ if ((IsValidCompanyID(_current_company) && IsHumanCompany(_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);