changeset 13053:a65b1859dfcd draft

(svn r17551) -Fix [FS#3201] (r17222): vehicles waiting for their time table didn't load anymore after their initial load was completed
author rubidium <rubidium@openttd.org>
date Tue, 15 Sep 2009 20:13:47 +0000
parents 6dba8bf1c036
children 1fa162c4d082
files src/economy.cpp
diffstat 1 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/economy.cpp
+++ b/src/economy.cpp
@@ -1095,9 +1095,6 @@
 {
 	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 */
@@ -1119,6 +1116,7 @@
 		/* The train reversed in the station. Take the "easy" way
 		 * out and let the train just leave as it always did. */
 		SetBit(v->vehicle_flags, VF_LOADING_FINISHED);
+		v->load_unload_time_rem = 1;
 		return;
 	}