mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r13664) -Fix [FS#2117]: bus/truck forgetting go-to-depot order when entering a non-drivethrough road stop.

release/0.7
rubidium 2008-06-30 15:13:40 +00:00
parent 4f5eae2789
commit f06daceb16
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/roadveh_cmd.cpp
View File

@ -1719,7 +1719,7 @@ again:
v->u.road.frame == RVC_DRIVE_THROUGH_STOP_FRAME))) {
RoadStop *rs = GetRoadStopByTile(v->tile, GetRoadStopType(v->tile));
Station* st = GetStationByTile(v->tile);
Station *st = GetStationByTile(v->tile);
/* Vehicle is at the stop position (at a bay) in a road stop.
* Note, if vehicle is loading/unloading it has already been handled,
@ -1754,19 +1754,13 @@ again:
v->last_station_visited = st->index;
if (IsDriveThroughStopTile(v->tile) || v->current_order.GetDestination() == st->index) {
if (IsDriveThroughStopTile(v->tile) || (v->current_order.IsType(OT_GOTO_STATION) && v->current_order.GetDestination() == st->index)) {
RoadVehArrivesAt(v, st);
v->BeginLoading();
} else {
v->current_order.MakeLeaveStation();
InvalidateVehicleOrder(v);
return false;
}
return false;
}
/* Vehicle is ready to leave a bay in a road stop */
if (!v->current_order.IsType(OT_GOTO_DEPOT)) {
} else {
/* Vehicle is ready to leave a bay in a road stop */
if (rs->IsEntranceBusy()) {
/* Road stop entrance is busy, so wait as there is nowhere else to go */
v->cur_speed = 0;