Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-04 06:00:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r11571) -Fix [FS#1493]: road vehicle getting to the wrong side of a station when trying to overtake in there.

Browse Source
This commit is contained in:
rubidium 2007-12-04 21:53:09 +00:00
parent d4322bc8aa
commit 4f0e072f3f
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/roadveh_cmd.cpp
View File

@ -1491,13 +1491,17 @@ static bool IndividualRoadVehicleController(Vehicle *v, const Vehicle *prev)
uint32 r;
if (v->u.road.overtaking != 0) {
if (++v->u.road.overtaking_ctr >= 35)
if (IsTileType(v->tile, MP_STATION)) {
/* Force us to be not overtaking! */
v->u.road.overtaking = 0;
} else if (++v->u.road.overtaking_ctr >= 35) {
/* If overtaking just aborts at a random moment, we can have a out-of-bound problem,
* if the vehicle started a corner. To protect that, only allow an abort of
* overtake if we are on straight roads */
if (v->u.road.state < RVSB_IN_ROAD_STOP && IsStraightRoadTrackdir((Trackdir)v->u.road.state)) {
v->u.road.overtaking = 0;
}
}
}
/* If this vehicle is in a depot and we've reached this point it must be