diff options
| author | Darkvater <darkvater@openttd.org> | 2006-09-05 23:21:41 +0000 |
|---|---|---|
| committer | Darkvater <darkvater@openttd.org> | 2006-09-05 23:21:41 +0000 |
| commit | 80814dbb1d01f651ba7c60547dc1b52c1c209378 (patch) | |
| tree | f2f14fca9ac095b0bf6b46615035b8c207e3ce66 /train_cmd.c | |
| parent | 516d412a77de7fb3d2278515d59a0c46bb9b461b (diff) | |
| download | openttd-80814dbb1d01f651ba7c60547dc1b52c1c209378.tar.xz | |
(svn r6406) -Codechange: Rename TileOffsByDir to TileOffsByDiagDir because it accepts
DiagDirections, and add TileOffsByDir that handles Directions.
-Codechange: Make the treeloop use TileOffsByDir().
Diffstat (limited to 'train_cmd.c')
| -rw-r--r-- | train_cmd.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/train_cmd.c b/train_cmd.c index 7780faf52..205653dbe 100644 --- a/train_cmd.c +++ b/train_cmd.c @@ -1650,7 +1650,7 @@ static void ReverseTrainDirection(Vehicle *v) dir = ChangeDiagDir(dir, DIAGDIRDIFF_90LEFT); } /* Calculate next tile */ - tile += TileOffsByDir(dir); + tile += TileOffsByDiagDir(dir); /* Check if the train left a rail/road-crossing */ DisableTrainCrossing(tile); @@ -2267,7 +2267,7 @@ static byte ChooseTrainTrack(Vehicle* v, TileIndex tile, DiagDirection enterdir, trackdir = GetVehicleTrackdir(v); assert(trackdir != 0xff); - ftd = NPFRouteToStationOrTile(tile - TileOffsByDir(enterdir), trackdir, &fstd, TRANSPORT_RAIL, v->owner, v->u.rail.compatible_railtypes); + ftd = NPFRouteToStationOrTile(tile - TileOffsByDiagDir(enterdir), trackdir, &fstd, TRANSPORT_RAIL, v->owner, v->u.rail.compatible_railtypes); if (ftd.best_trackdir == 0xff) { /* We are already at our target. Just do something */ @@ -2296,7 +2296,7 @@ static byte ChooseTrainTrack(Vehicle* v, TileIndex tile, DiagDirection enterdir, fd.best_track_dist = (uint)-1; fd.best_track = 0xFF; - NewTrainPathfind(tile - TileOffsByDir(enterdir), v->dest_tile, + NewTrainPathfind(tile - TileOffsByDiagDir(enterdir), v->dest_tile, v->u.rail.compatible_railtypes, enterdir, (NTPEnumProc*)NtpCallbFindStation, &fd); if (fd.best_track == 0xff) { @@ -3115,7 +3115,7 @@ red_light: { v->subspeed = 0; v->progress = 255-10; if (++v->load_unload_time_rem < _patches.wait_twoway_signal * 73) { - TileIndex o_tile = gp.new_tile + TileOffsByDir(enterdir); + TileIndex o_tile = gp.new_tile + TileOffsByDiagDir(enterdir); VehicleAtSignalData vasd; vasd.tile = o_tile; vasd.direction = ReverseDir(dir); @@ -3323,7 +3323,7 @@ static bool TrainCheckIfLineEnds(Vehicle *v) dir = ChangeDiagDir(dir, DIAGDIRDIFF_90LEFT); } /* Calculate next tile */ - tile += TileOffsByDir(dir); + tile += TileOffsByDiagDir(dir); // determine the track status on the next tile. ts = GetTileTrackStatus(tile, TRANSPORT_RAIL) & _reachable_tracks[dir]; |