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

Extend timetable wait/travel times from 16 to 32 bits wide

Browse Source
This commit is contained in:
Jonathan G Rennison
2018-10-22 18:21:30 +01:00
parent ee00a28717
commit 0e3986c39c
9 changed files with 34 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/timetable_gui.cpp
View File

@@ -917,14 +917,15 @@ struct TimetableWindow : Window {
uint32 p1 = PackTimetableArgs(v, this->sel_index, this->query_is_speed_query);
uint64 val = StrEmpty(str) ? 0 : strtoul(str, NULL, 10);
uint32 p2;
if (this->query_is_speed_query) {
val = ConvertDisplaySpeedToKmhishSpeed(val);
p2 = minu(val, UINT16_MAX);
} else {
if (!_settings_client.gui.timetable_in_ticks) val *= DATE_UNIT_SIZE;
p2 = val;
}
uint32 p2 = minu(val, UINT16_MAX);
DoCommandP(0, p1, p2, (this->change_timetable_all ? CMD_BULK_CHANGE_TIMETABLE : CMD_CHANGE_TIMETABLE) | CMD_MSG(STR_ERROR_CAN_T_TIMETABLE_VEHICLE));
break;
}