(svn r20130) -Fix [FS#3935]: Standard roadstops can also be left via manual depot orders.

This commit is contained in:
frosch 2010-07-11 20:34:29 +00:00
parent 283b4c184a
commit f717248990

View File

@ -1506,7 +1506,7 @@ again:
/* Vehicle is at the stop position (at a bay) in a road stop. /* Vehicle is at the stop position (at a bay) in a road stop.
* Note, if vehicle is loading/unloading it has already been handled, * Note, if vehicle is loading/unloading it has already been handled,
* so if we get here the vehicle has just arrived or is just ready to leave. */ * so if we get here the vehicle has just arrived or is just ready to leave. */
if (!v->current_order.IsType(OT_LEAVESTATION)) { if (v->current_order.ShouldStopAtStation(v, st->index)) {
/* Vehicle has arrived at a bay in a road stop */ /* Vehicle has arrived at a bay in a road stop */
if (IsDriveThroughStopTile(v->tile)) { if (IsDriveThroughStopTile(v->tile)) {
@ -1538,7 +1538,7 @@ again:
v->cur_speed = 0; v->cur_speed = 0;
return false; return false;
} }
v->current_order.Free(); if (v->current_order.IsType(OT_LEAVESTATION)) v->current_order.Free();
} }
if (IsStandardRoadStopTile(v->tile)) rs->SetEntranceBusy(true); if (IsStandardRoadStopTile(v->tile)) rs->SetEntranceBusy(true);