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

4
src/schdispatch_gui.cpp
View File

@@ -856,7 +856,7 @@ struct SchdispatchWindow : GeneralVehicleWindow {
if (StrEmpty(str)) break;
char *end;
int32 val = strtoul(str, &end, 10);
int32 val = std::strtoul(str, &end, 10);
if (val >= 0 && end != nullptr && *end == 0) {
uint minutes = (val % 100) % 60;
uint hours = (val / 100) % 24;
@@ -874,7 +874,7 @@ struct SchdispatchWindow : GeneralVehicleWindow {
if (StrEmpty(str)) break;
char *end;
int32 val = strtoul(str, &end, 10);
int32 val = std::strtoul(str, &end, 10);
if (val >= 0 && end != nullptr && *end == 0) {
uint minutes = (val % 100) % 60;
uint hours = (val / 100) % 24;