summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfrosch <frosch@openttd.org>2014-06-10 16:29:03 +0000
committerfrosch <frosch@openttd.org>2014-06-10 16:29:03 +0000
commit4d2107bd618ea56e5ee0ac1e7db1aa0b88b6551d (patch)
tree0b6906bae582b78cf707bab8ae52e443f740452a
parent26b61a4aeb1ebe00d7e83baf264c5bbc17047759 (diff)
downloadopenttd-4d2107bd618ea56e5ee0ac1e7db1aa0b88b6551d.tar.xz
(svn r26639) -Codechange: Simplify drawing early/late dates in timetable GUI.
-rw-r--r--src/timetable_gui.cpp26
1 files changed, 8 insertions, 18 deletions
diff --git a/src/timetable_gui.cpp b/src/timetable_gui.cpp
index 2c6a22c5d..ffea9a864 100644
--- a/src/timetable_gui.cpp
+++ b/src/timetable_gui.cpp
@@ -56,18 +56,6 @@ void SetTimetableParams(int param1, int param2, Ticks ticks)
}
/**
- * Sets the arrival or departure string and parameters.
- * @param param1 the first DParam to fill
- * @param param2 the second DParam to fill
- * @param ticks the number of ticks to 'draw'
- */
-static void SetArrivalDepartParams(int param1, int param2, Ticks ticks)
-{
- SetDParam(param1, STR_JUST_DATE_TINY);
- SetDParam(param2, _date + (ticks / DAY_TICKS));
-}
-
-/**
* Check whether it is possible to determine how long the order takes.
* @param order the order to check.
* @param travelling whether we are interested in the travel or the wait part.
@@ -462,18 +450,20 @@ struct TimetableWindow : Window {
if (arr_dep[i / 2].arrival != INVALID_TICKS) {
DrawString(abbr_left, abbr_right, y, STR_TIMETABLE_ARRIVAL_ABBREVIATION, i == selected ? TC_WHITE : TC_BLACK);
if (this->show_expected && i / 2 == earlyID) {
- SetArrivalDepartParams(0, 1, arr_dep[i / 2].arrival);
- DrawString(time_left, time_right, y, STR_GREEN_STRING, i == selected ? TC_WHITE : TC_BLACK);
+ SetDParam(0, _date + arr_dep[i / 2].arrival / DAY_TICKS);
+ DrawString(time_left, time_right, y, STR_JUST_DATE_TINY, TC_GREEN);
} else {
- SetArrivalDepartParams(0, 1, arr_dep[i / 2].arrival + offset);
- DrawString(time_left, time_right, y, show_late ? STR_RED_STRING : STR_JUST_STRING, i == selected ? TC_WHITE : TC_BLACK);
+ SetDParam(0, _date + (arr_dep[i / 2].arrival + offset) / DAY_TICKS);
+ DrawString(time_left, time_right, y, STR_JUST_DATE_TINY,
+ show_late ? TC_RED : i == selected ? TC_WHITE : TC_BLACK);
}
}
} else {
if (arr_dep[i / 2].departure != INVALID_TICKS) {
DrawString(abbr_left, abbr_right, y, STR_TIMETABLE_DEPARTURE_ABBREVIATION, i == selected ? TC_WHITE : TC_BLACK);
- SetArrivalDepartParams(0, 1, arr_dep[i/2].departure + offset);
- DrawString(time_left, time_right, y, show_late ? STR_RED_STRING : STR_JUST_STRING, i == selected ? TC_WHITE : TC_BLACK);
+ SetDParam(0, _date + (arr_dep[i/2].departure + offset) / DAY_TICKS);
+ DrawString(time_left, time_right, y, STR_JUST_DATE_TINY,
+ show_late ? TC_RED : i == selected ? TC_WHITE : TC_BLACK);
}
}
y += FONT_HEIGHT_NORMAL;