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

(svn r11017) -Codechange: unify determining whether a vehicle needs/can be service a little more.

Browse Source
This commit is contained in:
rubidium
2007-08-31 17:13:39 +00:00
parent 976ce8ad3f
commit 2c8e50f20c
5 changed files with 12 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/train_cmd.cpp
View File

@@ -3348,18 +3348,8 @@ void Train::Tick()
static void CheckIfTrainNeedsService(Vehicle *v)
{
if (_patches.servint_trains == 0) return;
if (!VehicleNeedsService(v)) return;
if (v->vehstatus & VS_STOPPED) return;
if (_patches.gotodepot && VehicleHasDepotOrders(v)) return;
/* Don't interfere with a depot visit scheduled by the user, or a
* depot visit by the order list. */
if (v->current_order.type == OT_GOTO_DEPOT &&
(v->current_order.flags & (OF_HALT_IN_DEPOT | OF_PART_OF_ORDERS)) != 0)
return;
if (CheckTrainIsInsideDepot(v)) {
if (_patches.servint_trains == 0 || !VehicleNeedsService(v)) return;
if (v->IsInDepot()) {
VehicleServiceInDepot(v);
return;
}
@@ -3386,8 +3376,6 @@ static void CheckIfTrainNeedsService(Vehicle *v)
return;
}
if (v->current_order.type == OT_LOADING) v->LeaveStation();
v->current_order.type = OT_GOTO_DEPOT;
v->current_order.flags = OF_NON_STOP;
v->current_order.dest = depot->index;