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 /order_gui.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 'order_gui.c')
| -rw-r--r-- | order_gui.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/order_gui.c b/order_gui.c index 6699e62d9..ca2c3be0a 100644 --- a/order_gui.c +++ b/order_gui.c @@ -184,7 +184,7 @@ static Order GetOrderCmdFromTile(Vehicle *v, uint tile) // check depot first if (_patches.gotodepot) { - switch(GET_TILETYPE(tile)) { + switch (TileType(tile)) { case MP_RAILWAY: if (v->type == VEH_Train && _map_owner[tile] == _local_player) { if ((_map5[tile]&0xFC)==0xC0) { @@ -231,7 +231,7 @@ static Order GetOrderCmdFromTile(Vehicle *v, uint tile) } // check waypoint - if (IS_TILETYPE(tile, MP_RAILWAY) + if (IsTileType(tile, MP_RAILWAY) && v->type == VEH_Train && _map_owner[tile] == _local_player && (_map5[tile]&0xFE)==0xC4) { @@ -241,7 +241,7 @@ static Order GetOrderCmdFromTile(Vehicle *v, uint tile) return order; } - if (IS_TILETYPE(tile, MP_STATION)) { + if (IsTileType(tile, MP_STATION)) { st = GetStation(st_index = _map2[tile]); if (st->owner == _current_player || st->owner == OWNER_NONE) { |