summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2009-08-19 15:27:55 +0000
committerrubidium <rubidium@openttd.org>2009-08-19 15:27:55 +0000
commit0780dc8138ae6edf3aee217f48e7759804a95464 (patch)
treee463fd3bd91d9879b380d9ee4f009a52ecf503a3 /src
parent5a863925ee6c1ba78ec1ca59e73cebe2840d4345 (diff)
downloadopenttd-0780dc8138ae6edf3aee217f48e7759804a95464.tar.xz
(svn r17222) -Fix [FS#3129, FS#3130]: with time tables vehicles would stay in the 'loading' state after they have finished loading
Diffstat (limited to 'src')
-rw-r--r--src/economy.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/economy.cpp b/src/economy.cpp
index 94674a5b6..f3d4c7499 100644
--- a/src/economy.cpp
+++ b/src/economy.cpp
@@ -1107,6 +1107,10 @@ void PrepareUnload(Vehicle *front_v)
static void LoadUnloadVehicle(Vehicle *v, int *cargo_left)
{
assert(v->current_order.IsType(OT_LOADING));
+
+ /* When we've finished loading we're just staying here till the timetable 'runs' out */
+ if (HasBit(v->vehicle_flags, VF_LOADING_FINISHED)) return;
+
assert(v->load_unload_time_rem != 0);
/* We have not waited enough time till the next round of loading/unloading */