mirror/OpenTTD
1
0
Fork 1
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-09-03 03:49:12 +00:00
Code Issues Activity

(svn r9808) -Codechange: unify the Handle<VehicleType>Loading functions.

Browse Source
This commit is contained in:
rubidium
2007-05-07 16:21:34 +00:00
parent 161786e222
commit 2efecd34c4
6 changed files with 45 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/train_cmd.cpp
View File

@@ -2526,35 +2526,6 @@ void Train::MarkDirty()
UpdateTrainAcceleration(this);
}
static void HandleTrainLoading(Vehicle *v, bool mode)
{
switch (v->current_order.type) {
case OT_LOADING: {
if (mode) return;
if (--v->load_unload_time_rem) return;
if (LoadUnloadVehicle(v)) return;
v->PlayLeaveStationSound();
Order b = v->current_order;
v->LeaveStation();
/* If this was not the final order, don't remove it from the list. */
if (!(b.flags & OF_NON_STOP)) return;
break;
}
case OT_DUMMY: break;
default: return;
}
v->cur_order_index++;
InvalidateVehicleOrder(v);
}
static int UpdateTrainSpeed(Vehicle *v)
{
uint accel;
@@ -3333,7 +3304,7 @@ static void TrainLocoHandler(Vehicle *v, bool mode)
return;
}
HandleTrainLoading(v, mode);
v->HandleLoading(mode);
if (v->current_order.type == OT_LOADING) return;