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/debug.cpp
View File

@@ -262,7 +262,7 @@ void SetDebugString(const char *s, void (*error_func)(const char *))
if (*s >= '0' && *s <= '9') {
const DebugLevel *i;
v = strtoul(s, &end, 0);
v = std::strtoul(s, &end, 0);
s = end;
for (i = debug_level; i != endof(debug_level); ++i) {
@@ -289,7 +289,7 @@ void SetDebugString(const char *s, void (*error_func)(const char *))
}
if (*s == '=') s++;
v = strtoul(s, &end, 0);
v = std::strtoul(s, &end, 0);
s = end;
if (found != nullptr) {
new_levels[found->name] = v;