(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 c915d9fa55
commit 3ee31a8f89
9 changed files with 152 additions and 85 deletions

View File

@@ -266,7 +266,7 @@ void DrawOrderString(const Vehicle *v, const Order *order, int order_index, int
if (timetable) {
SetDParam(3, STR_EMPTY);
if (order->GetWaitTime() > 0) {
if (order->IsWaitTimetabled()) {
SetDParam(5, STR_TIMETABLE_STAY_FOR);
SetTimetableParams(6, 7, order->GetWaitTime());
}
@@ -334,7 +334,7 @@ void DrawOrderString(const Vehicle *v, const Order *order, int order_index, int
SetDParam(4, value);
}
if (timetable && order->GetWaitTime() > 0) {
if (timetable && order->IsWaitTimetabled()) {
SetDParam(5, STR_TIMETABLE_AND_TRAVEL_FOR);
SetTimetableParams(6, 7, order->GetWaitTime());
} else {