diff options
author | tron <tron@openttd.org> | 2005-01-16 11:24:58 +0000 |
---|---|---|
committer | tron <tron@openttd.org> | 2005-01-16 11:24:58 +0000 |
commit | ae796740aab0ee480759d2015014b29e2a7aedb4 (patch) | |
tree | bc9e7bccf2119556badf2efe43aca901dfc0a76e /ttd.c | |
parent | d2643dc483abbd086441b126912f466127253b06 (diff) | |
download | openttd-ae796740aab0ee480759d2015014b29e2a7aedb4.tar.xz |
(svn r1536) Move GET_TILEHEIGHT, GET_TILETYPE and IS_TILETYPE to map.h, turn them into inline functions and add some asserts
Diffstat (limited to 'ttd.c')
-rw-r--r-- | ttd.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1193,13 +1193,13 @@ void ConvertTownOwner() uint tile; for (tile = 0; tile != MapSize(); tile++) { - if (IS_TILETYPE(tile, MP_STREET)) { + if (IsTileType(tile, MP_STREET)) { if ((_map5[tile] & 0xF0) == 0x10 && _map3_lo[tile] & 0x80) _map3_lo[tile] = OWNER_TOWN; if (_map_owner[tile] & 0x80) _map_owner[tile] = OWNER_TOWN; - } else if (IS_TILETYPE(tile, MP_TUNNELBRIDGE)) { + } else if (IsTileType(tile, MP_TUNNELBRIDGE)) { if (_map_owner[tile] & 0x80) _map_owner[tile] = OWNER_TOWN; } @@ -1292,7 +1292,7 @@ bool AfterLoadGame(uint version) uint h = MapSizeY(); BEGIN_TILE_LOOP(tile_cur, w, h, tile) - if (IS_TILETYPE(tile_cur, MP_WATER) && _map_owner[tile_cur] >= MAX_PLAYERS) + if (IsTileType(tile_cur, MP_WATER) && _map_owner[tile_cur] >= MAX_PLAYERS) _map_owner[tile_cur] = OWNER_WATER; END_TILE_LOOP(tile_cur, w, h, tile) } |