dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
fonsinchen
2014-05-01 14:49:16 +00:00
parent c915d9fa55
commit 3ee31a8f89
9 changed files with 152 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/economy.cpp
View File

@@ -1675,7 +1675,7 @@ static void LoadUnloadVehicle(Vehicle *front)
/* We loaded less cargo than possible for all cargo types and it's not full
* load and we're not supposed to wait any longer: stop loading. */
if (!anything_unloaded && full_load_amount == 0 && reservation_left == 0 && !(front->current_order.GetLoadType() & OLFB_FULL_LOAD) &&
front->current_order_time >= (uint)max(front->current_order.GetWaitTime() - front->lateness_counter, 0)) {
front->current_order_time >= (uint)max(front->current_order.GetTimetabledWait() - front->lateness_counter, 0)) {
SetBit(front->vehicle_flags, VF_STOP_LOADING);
}
} else {