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

Fix input and display of hhmm times in scheduled dispatch GUI

Browse Source 
When using high ticks/min and day length
This commit is contained in:
innocenat
2019-01-30 20:26:21 +00:00
committed by Jonathan G Rennison
parent 281d346fe2
commit b93a4d6daa
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/schdispatch_gui.cpp
View File

@@ -270,7 +270,7 @@ struct SchdispatchWindow : Window {
* @param right Right side of the box to draw in. * @param right Right side of the box to draw in.
* @param y Top of the box to draw in. * @param y Top of the box to draw in.
*/ */
void DrawScheduledTime(const int time, int left, int right, int y, TextColour colour) const void DrawScheduledTime(const DateTicksScaled time, int left, int right, int y, TextColour colour) const
{ {
bool rtl = _current_text_dir == TD_RTL; bool rtl = _current_text_dir == TD_RTL;
uint diff_x, diff_y; uint diff_x, diff_y;
@@ -483,10 +483,10 @@ struct SchdispatchWindow : Window {
if (val >= 0 && end && *end == 0) { if (val >= 0 && end && *end == 0) {
uint minutes = (val % 100) % 60; uint minutes = (val % 100) % 60;
uint hours = (val / 100) % 24; uint hours = (val / 100) % 24;
val = MINUTES_DATE(MINUTES_DAY(CURRENT_MINUTE), hours, minutes); DateTicksScaled slot = MINUTES_DATE(MINUTES_DAY(CURRENT_MINUTE), hours, minutes);
val -= _settings_client.gui.clock_offset; slot -= _settings_client.gui.clock_offset;
val *= _settings_client.gui.ticks_per_minute; slot *= _settings_client.gui.ticks_per_minute;
ScheduleAddIntl(v->index, val); ScheduleAddIntl(v->index, slot);
} }
break; break;
} }
@@ -498,10 +498,10 @@ struct SchdispatchWindow : Window {
if (val >= 0 && end && *end == 0) { if (val >= 0 && end && *end == 0) {
uint minutes = (val % 100) % 60; uint minutes = (val % 100) % 60;
uint hours = (val / 100) % 24; uint hours = (val / 100) % 24;
val = MINUTES_DATE(MINUTES_DAY(CURRENT_MINUTE), hours, minutes); DateTicksScaled start = MINUTES_DATE(MINUTES_DAY(CURRENT_MINUTE), hours, minutes);
val -= _settings_client.gui.clock_offset; start -= _settings_client.gui.clock_offset;
val *= _settings_client.gui.ticks_per_minute; start *= _settings_client.gui.ticks_per_minute;
SetScheduleStartDateIntl(v->index, val); SetScheduleStartDateIntl(v->index, start);
} }
break; break;
} }