(svn r26547) -Codechange: Collect order travel and wait times independent of timetables

This commit is contained in:
fonsinchen
2014-05-01 14:49:16 +00:00
parent d49dad9f9c
commit c81a6070cb
9 changed files with 152 additions and 85 deletions

View File

@@ -2137,7 +2137,7 @@ void Vehicle::HandleLoading(bool mode)
{
switch (this->current_order.GetType()) {
case OT_LOADING: {
uint wait_time = max(this->current_order.GetWaitTime() - this->lateness_counter, 0);
uint wait_time = max(this->current_order.GetTimetabledWait() - this->lateness_counter, 0);
/* Not the first call for this tick, or still loading */
if (mode || !HasBit(this->vehicle_flags, VF_LOADING_FINISHED) || this->current_order_time < wait_time) return;