From f7172489906fb64793410fa558c6a1eda311c933 Mon Sep 17 00:00:00 2001 From: frosch Date: Sun, 11 Jul 2010 20:34:29 +0000 Subject: (svn r20130) -Fix [FS#3935]: Standard roadstops can also be left via manual depot orders. --- src/roadveh_cmd.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp index 63bc8f41f..8c6ba78eb 100644 --- a/src/roadveh_cmd.cpp +++ b/src/roadveh_cmd.cpp @@ -1506,7 +1506,7 @@ again: /* Vehicle is at the stop position (at a bay) in a road stop. * 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. */ - 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 */ if (IsDriveThroughStopTile(v->tile)) { @@ -1538,7 +1538,7 @@ again: v->cur_speed = 0; return false; } - v->current_order.Free(); + if (v->current_order.IsType(OT_LEAVESTATION)) v->current_order.Free(); } if (IsStandardRoadStopTile(v->tile)) rs->SetEntranceBusy(true); -- cgit v1.2.3-54-g00ecf