summaryrefslogtreecommitdiff
path: root/rail_gui.c
diff options
context:
space:
mode:
authortron <tron@openttd.org>2005-01-16 11:24:58 +0000
committertron <tron@openttd.org>2005-01-16 11:24:58 +0000
commitae796740aab0ee480759d2015014b29e2a7aedb4 (patch)
treebc9e7bccf2119556badf2efe43aca901dfc0a76e /rail_gui.c
parentd2643dc483abbd086441b126912f466127253b06 (diff)
downloadopenttd-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 'rail_gui.c')
-rw-r--r--rail_gui.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/rail_gui.c b/rail_gui.c
index 63fccd86d..40034cb1a 100644
--- a/rail_gui.c
+++ b/rail_gui.c
@@ -100,7 +100,7 @@ void CcRailDepot(bool success, uint tile, uint32 p1, uint32 p2)
tile += TileOffsByDir(dir);
- if (IS_TILETYPE(tile, MP_RAILWAY)) {
+ if (IsTileType(tile, MP_RAILWAY)) {
PlaceExtraDepotRail(tile, _place_depot_extra[dir]);
PlaceExtraDepotRail(tile, _place_depot_extra[dir + 4]);
PlaceExtraDepotRail(tile, _place_depot_extra[dir + 8]);
@@ -394,11 +394,11 @@ static int GetBestFit1x1(int x, int y)
};
tile += ToTileIndexDiff(_tile_inc[i]);
m[i] = 0;
- if (IS_TILETYPE(tile, MP_RAILWAY) && _map5[tile] < 0x80)
+ if (IsTileType(tile, MP_RAILWAY) && _map5[tile] < 0x80)
m[i] = _map5[tile]&0x3F;
// handle tracks under bridge
- if(IS_TILETYPE(tile, MP_TUNNELBRIDGE) && (_map5[tile]&0xF8)==0xE0)
+ if(IsTileType(tile, MP_TUNNELBRIDGE) && (_map5[tile]&0xF8)==0xE0)
m[i] = (byte) !(_map5[tile]&0x01) + 1;
if (_remove_button_clicked) m[i] ^= 0x3F;