From 61a6bc544d9e656feb4458b6f9a86f7b7e01e7d6 Mon Sep 17 00:00:00 2001 From: tron Date: Sun, 16 Jan 2005 11:24:58 +0000 Subject: (svn r1536) Move GET_TILEHEIGHT, GET_TILETYPE and IS_TILETYPE to map.h, turn them into inline functions and add some asserts --- ttd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ttd.c') diff --git a/ttd.c b/ttd.c index f86ca5ceb..1dbedac10 100644 --- a/ttd.c +++ b/ttd.c @@ -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) } -- cgit v1.2.3-54-g00ecf