(svn r17551) -Fix [FS#3201] (r17222): vehicles waiting for their time table didn't load anymore after their initial load was completed

This commit is contained in:
rubidium 2009-09-15 20:13:47 +00:00
parent 28f759f905
commit e9ae22d2c5

View File

@ -1095,9 +1095,6 @@ static void LoadUnloadVehicle(Vehicle *v, int *cargo_left)
{ {
assert(v->current_order.IsType(OT_LOADING)); 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); assert(v->load_unload_time_rem != 0);
/* We have not waited enough time till the next round of loading/unloading */ /* We have not waited enough time till the next round of loading/unloading */
@ -1119,6 +1116,7 @@ static void LoadUnloadVehicle(Vehicle *v, int *cargo_left)
/* The train reversed in the station. Take the "easy" way /* The train reversed in the station. Take the "easy" way
* out and let the train just leave as it always did. */ * out and let the train just leave as it always did. */
SetBit(v->vehicle_flags, VF_LOADING_FINISHED); SetBit(v->vehicle_flags, VF_LOADING_FINISHED);
v->load_unload_time_rem = 1;
return; return;
} }