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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	.github/workflows/release-macos.yml
#	src/company_gui.cpp
#	src/linkgraph/linkgraph.cpp
#	src/newgrf_debug_gui.cpp
#	src/strgen/strgen_base.cpp
#	src/timetable_gui.cpp
This commit is contained in:
Jonathan G Rennison
2023-05-28 10:20:03 +01:00
parent b02817f262 1a24016964
commit 6091d7470c
146 changed files with 393 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/timetable_gui.cpp
View File

@@ -67,7 +67,7 @@ Ticks ParseTimetableDuration(const char *str)
if (StrEmpty(str)) return 0;
if (_settings_client.gui.timetable_in_ticks) {
return strtoul(str, nullptr, 10);
return std::strtoul(str, nullptr, 10);
}
char tmp_buffer[64];
@@ -1112,7 +1112,7 @@ struct TimetableWindow : GeneralVehicleWindow {
case WID_VT_CHANGE_TIME: {
uint32 p2;
if (this->query_is_speed_query) {
uint64 display_speed = StrEmpty(str) ? 0 : strtoul(str, nullptr, 10);
uint64 display_speed = StrEmpty(str) ? 0 : std::strtoul(str, nullptr, 10);
uint64 val = ConvertDisplaySpeedToKmhishSpeed(display_speed, v->type);
p2 = std::min<uint>(val, UINT16_MAX);
} else {
@@ -1126,7 +1126,7 @@ struct TimetableWindow : GeneralVehicleWindow {
case WID_VT_START_DATE: {
if (StrEmpty(str)) break;
char *end;
int32 val = strtol(str, &end, 10);
int32 val = std::strtol(str, &end, 10);
if (val >= 0 && end && *end == 0) {
uint minutes = (val % 100) % 60;
uint hours = (val / 100) % 24;