From dcd605a9a93e9492f15766ba78e6793ee35490f3 Mon Sep 17 00:00:00 2001 From: frosch Date: Mon, 12 Jul 2010 19:36:06 +0000 Subject: [PATCH] (svn r20133) -Revert (r20130): Vehicles could deadlock themself in roadstops. --- src/roadveh_cmd.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp index 8c6ba78ebe..63bc8f41ff 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.ShouldStopAtStation(v, st->index)) { + if (!v->current_order.IsType(OT_LEAVESTATION)) { /* 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; } - if (v->current_order.IsType(OT_LEAVESTATION)) v->current_order.Free(); + v->current_order.Free(); } if (IsStandardRoadStopTile(v->tile)) rs->SetEntranceBusy(true);