gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-09 15:41:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r20133) -Revert (r20130): Vehicles could deadlock themself in roadstops.

Browse Source
This commit is contained in:
frosch 2010-07-12 19:36:06 +00:00
parent 0a026ff41f
commit dcd605a9a9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/roadveh_cmd.cpp
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.ShouldStopAtStation(v, st->index)) { if (!v->current_order.IsType(OT_LEAVESTATION)) {
/* 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;
} }
if (v->current_order.IsType(OT_LEAVESTATION)) v->current_order.Free(); v->current_order.Free();
} }
if (IsStandardRoadStopTile(v->tile)) rs->SetEntranceBusy(true); if (IsStandardRoadStopTile(v->tile)) rs->SetEntranceBusy(true);