diff options
| author | tron <tron@openttd.org> | 2005-06-04 11:56:32 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2005-06-04 11:56:32 +0000 |
| commit | 0c4ecbe9ece42d071a4f4e4b6d506be32030cb4c (patch) | |
| tree | 172ef15bca6626b797fbf586a043a978ee884141 /town_cmd.c | |
| parent | 19e2b40a788cc175f35e4ca0cec0f439bd46ab76 (diff) | |
| download | openttd-0c4ecbe9ece42d071a4f4e4b6d506be32030cb4c.tar.xz | |
(svn r2407) Use {Get,Is}TileOwner to get/check the owner of a tile and fix some bogus reads of _map_owner
Diffstat (limited to 'town_cmd.c')
| -rw-r--r-- | town_cmd.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/town_cmd.c b/town_cmd.c index 711774752..cea348909 100644 --- a/town_cmd.c +++ b/town_cmd.c @@ -741,7 +741,7 @@ static int GrowTownAtRoad(Town *t, uint tile) if (IsTileType(tile, MP_STREET)) { /* Don't allow building over roads of other cities */ - if (_map_owner[tile] == OWNER_TOWN && GetTown(_map2[tile]) != t) + if (IsTileOwner(tile, OWNER_TOWN) && GetTown(_map2[tile]) != t) _grow_town_result = -1; else if (_game_mode == GM_EDITOR) { /* If we are in the SE, and this road-piece has no town owner yet, it just found an @@ -1495,7 +1495,7 @@ void DeleteTown(Town *t) case MP_STREET: case MP_TUNNELBRIDGE: - if (_map_owner[tile] == OWNER_TOWN && + if (IsTileOwner(tile, OWNER_TOWN) && ClosestTownFromTile(tile, (uint)-1) == t) DoCommandByTile(tile, 0, 0, DC_EXEC, CMD_LANDSCAPE_CLEAR); break; @@ -1837,15 +1837,12 @@ Town *ClosestTownFromTile(uint tile, uint threshold) Town *t; uint dist, best = threshold; Town *best_town = NULL; - byte owner; // XXX - Fix this so for a given tiletype the owner of the type is in the same variable - if (IsTileType(tile, MP_STREET) && (_map5[tile] & 0xF0) == 0x10) { // rail crossing - owner = _map3_lo[tile]; - } else - owner = _map_owner[tile]; - - if ((IsTileType(tile, MP_STREET) && owner == OWNER_TOWN) || IsTileType(tile, MP_HOUSE)) + if (IsTileType(tile, MP_HOUSE) || ( + IsTileType(tile, MP_STREET) && + ((_map5[tile] & 0xF0) != 0x10 ? GetTileOwner(tile) : _map3_lo[tile]) == OWNER_TOWN + )) return GetTown(_map2[tile]); FOR_ALL_TOWNS(t) { |