From ab1b8ab209f53d9b9f7ac73f3495fbd0d3f64ddb Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Wed, 29 Jan 2020 02:19:47 +0000 Subject: [PATCH] Scheduled dispatch: Add schedule end time to info line --- src/lang/english.txt | 2 +- src/lang/german.txt | 2 +- src/schdispatch_gui.cpp | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lang/english.txt b/src/lang/english.txt index 06e4b3c78b..e69895ba00 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -6220,7 +6220,7 @@ STR_SCHDISPATCH_RESET_LAST_DISPATCH_TOOLTIP :{BLACK}Reset th STR_SCHDISPATCH_SUMMARY_LAST_DEPARTURE_PAST :{BLACK}Last departure at {DATE_WALLCLOCK_TINY}. STR_SCHDISPATCH_SUMMARY_LAST_DEPARTURE_FUTURE :{BLACK}Last departure has not left yet, it will depart at {DATE_WALLCLOCK_TINY}. STR_SCHDISPATCH_SUMMARY_L1 :{BLACK}This schedule requires {COMMA} vehicle{P "" s}. -STR_SCHDISPATCH_SUMMARY_L2 :{BLACK}This schedule repeats every {STRING3} and began on {DATE_WALLCLOCK_TINY}. +STR_SCHDISPATCH_SUMMARY_L2 :{BLACK}This schedule repeats every {STRING3}, began at {DATE_WALLCLOCK_TINY}, and ends at {DATE_WALLCLOCK_TINY}. STR_SCHDISPATCH_SUMMARY_L3 :{BLACK}Maximum delay of {STRING3} is allowed before the slot is skipped. STR_SCHDISPATCH_SUMMARY_NOT_ENABLED :{BLACK}This schedule is not active. diff --git a/src/lang/german.txt b/src/lang/german.txt index b1367ba3d5..32d0033732 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -5924,6 +5924,6 @@ STR_SCHDISPATCH_DELAY_CAPTION_DAY :{BLACK}Verspät STR_SCHDISPATCH_SUMMARY_LAST_DEPARTURE_PAST :{BLACK}Letzte Abfahrt am {DATE_WALLCLOCK_TINY}. STR_SCHDISPATCH_SUMMARY_LAST_DEPARTURE_FUTURE :{BLACK}Letzte Abfahrt hat den Bahnhof noch nicht verlassen; Abfahrt am {DATE_WALLCLOCK_TINY}. STR_SCHDISPATCH_SUMMARY_L1 :{BLACK}Dieser Fahrplan erfordert {COMMA} Fahrzeug{P "" e}. -STR_SCHDISPATCH_SUMMARY_L2 :{BLACK}Dieser Fahrplan wiederholt sich alle {STRING} und begann am {DATE_WALLCLOCK_TINY}. +STR_SCHDISPATCH_SUMMARY_L2 :{BLACK}Dieser Fahrplan wiederholt sich alle {STRING} und begann am {DATE_WALLCLOCK_TINY} und endet am {DATE_WALLCLOCK_TINY}. STR_SCHDISPATCH_SUMMARY_L3 :{BLACK}Es ist eine maximale Verspätung von {STRING} erlaubt, ehe der Slot übersprungen wird. STR_SCHDISPATCH_SUMMARY_NOT_ENABLED :{BLACK}Dieser Fahrplan ist nicht aktiv. diff --git a/src/schdispatch_gui.cpp b/src/schdispatch_gui.cpp index 36de7122d2..0d55797259 100644 --- a/src/schdispatch_gui.cpp +++ b/src/schdispatch_gui.cpp @@ -367,6 +367,7 @@ struct SchdispatchWindow : Window { SetTimetableParams(0, v->orders.list->GetScheduledDispatchDuration()); SetDParam(4, v->orders.list->GetScheduledDispatchStartTick()); + SetDParam(5, v->orders.list->GetScheduledDispatchStartTick() + v->orders.list->GetScheduledDispatchDuration()); DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, y, STR_SCHDISPATCH_SUMMARY_L2); y += FONT_HEIGHT_NORMAL;