mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r6496) -Codechange: removed direct map access in train_cmd.c (Rubidium)

This commit is contained in:
glx 2006-09-22 22:15:34 +00:00
parent 4921538e1d
commit bae85177d4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
train_cmd.c
View File

@ -3107,12 +3107,12 @@ red_light: {
* 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 @@ static bool TrainCheckIfLineEnds(Vehicle *v)
// 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 */