dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r14089) -Fix [FS#2219]: trains not being able to find a route to a depot when the front is already in the depot.

Browse Source
This commit is contained in:
rubidium
2008-08-17 11:04:37 +00:00
parent f7ce9339ba
commit b6b9cd9d51
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/vehicle.cpp
View File

@@ -2496,7 +2496,7 @@ CommandCost Vehicle::SendToDepot(uint32 flags, DepotCommand command)
{
if (!CheckOwnership(this->owner)) return CMD_ERROR;
if (this->vehstatus & VS_CRASHED) return CMD_ERROR;
if (this->IsInDepot()) return CMD_ERROR;
if (this->IsStoppedInDepot()) return CMD_ERROR;
if (this->current_order.IsType(OT_GOTO_DEPOT)) {
bool halt_in_depot = this->current_order.GetDepotActionType() & ODATFB_HALT;
@@ -2524,10 +2524,6 @@ CommandCost Vehicle::SendToDepot(uint32 flags, DepotCommand command)
return CommandCost();
}
/* check if at a standstill (not stopped only) in a depot
* the check is down here to make it possible to alter stop/service for trains entering the depot */
if (this->type == VEH_TRAIN && IsRailDepotTile(this->tile) && this->cur_speed == 0) return CMD_ERROR;
TileIndex location;
DestinationID destination;
bool reverse;