Mercurial > hg > openttd
changeset 4632:e09a544f7bbe draft
(svn r6496) -Codechange: removed direct map access in train_cmd.c (Rubidium)
author | glx <glx@openttd.org> |
---|---|
date | Fri, 22 Sep 2006 22:15:34 +0000 |
parents | b15ae45f6cc5 |
children | d98deab05efa |
files | train_cmd.c |
diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/train_cmd.c +++ b/train_cmd.c @@ -3107,12 +3107,12 @@ * FIND_FIRST_BIT only handles 6 bits at a time. */ i = FindFirstBit2x64(ts); - if (!(_m[gp.new_tile].m3 & SignalAgainstTrackdir(i))) { + if (!HasSignalOnTrackdir(gp.new_tile, ReverseTrackdir(i))) { v->cur_speed = 0; v->subspeed = 0; v->progress = 255 - 100; if (++v->load_unload_time_rem < _patches.wait_oneway_signal * 20) return; - } else if (_m[gp.new_tile].m3 & SignalAlongTrackdir(i)){ + } else if (HasSignalOnTrackdir(gp.new_tile, i)){ v->cur_speed = 0; v->subspeed = 0; v->progress = 255-10; @@ -3316,7 +3316,7 @@ // depot? /* XXX -- When enabled, this makes it possible to crash trains of others (by building a depot right against a station) */ -/* if (IsTileType(tile, MP_RAILWAY) && (_m[tile].m5 & 0xFC) == 0xC0) +/* if (IsTileType(tile, MP_RAILWAY) && GetRailTileType(tile) == RAIL_TILE_DEPOT_WAYPOINT) return true;*/ /* Determine the non-diagonal direction in which we will exit this tile */