diff options
author | frosch <frosch@openttd.org> | 2010-07-12 19:36:06 +0000 |
---|---|---|
committer | frosch <frosch@openttd.org> | 2010-07-12 19:36:06 +0000 |
commit | dcd605a9a93e9492f15766ba78e6793ee35490f3 (patch) | |
tree | 517d5afb19d3de3f3a810e3c6b348cabbd87b742 /src | |
parent | 0a026ff41fe054d40f02d138dcbe6e8ed8240fa1 (diff) | |
download | openttd-dcd605a9a93e9492f15766ba78e6793ee35490f3.tar.xz |
(svn r20133) -Revert (r20130): Vehicles could deadlock themself in roadstops.
Diffstat (limited to 'src')
-rw-r--r-- | src/roadveh_cmd.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp index 8c6ba78eb..63bc8f41f 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); |