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

@@ -159,7 +159,7 @@ struct FileStringReader : StringReader {
void FileStringReader::HandlePragma(char *str)
{
if (!memcmp(str, "id ", 3)) {
this->data.next_string_id = strtoul(str + 3, nullptr, 0);
this->data.next_string_id = std::strtoul(str + 3, nullptr, 0);
} else if (!memcmp(str, "name ", 5)) {
strecpy(_lang.name, str + 5, lastof(_lang.name));
} else if (!memcmp(str, "ownname ", 8)) {
@@ -185,14 +185,14 @@ void FileStringReader::HandlePragma(char *str)
strecpy(_lang.digit_decimal_separator, strcmp(str, "{NBSP}") == 0 ? NBSP : str, lastof(_lang.digit_decimal_separator));
} else if (!memcmp(str, "winlangid ", 10)) {
const char *buf = str + 10;
long langid = strtol(buf, nullptr, 16);
long langid = std::strtol(buf, nullptr, 16);
if (langid > (long)UINT16_MAX || langid < 0) {
error("Invalid winlangid %s", buf);
}
_lang.winlangid = (uint16)langid;
} else if (!memcmp(str, "grflangid ", 10)) {
const char *buf = str + 10;
long langid = strtol(buf, nullptr, 16);
long langid = std::strtol(buf, nullptr, 16);
if (langid >= 0x7F || langid < 0) {
error("Invalid grflangid %s", buf);
}

6
src/strgen/strgen_base.cpp
View File

@@ -312,7 +312,7 @@ bool ParseRelNum(char **buf, int *value, int *offset)
rel = true;
s++;
}
int v = strtol(s, &end, 0);
int v = std::strtol(s, &end, 0);
if (end == s) return false;
if (rel || v < 0) {
*value += v;
@@ -322,7 +322,7 @@ bool ParseRelNum(char **buf, int *value, int *offset)
if (offset != nullptr && *end == ':') {
/* Take the Nth within */
s = end + 1;
*offset = strtol(s, &end, 0);
*offset = std::strtol(s, &end, 0);
if (end == s) return false;
}
*buf = end;
@@ -512,7 +512,7 @@ static const CmdStruct *ParseCommandString(const char **str, char *param, int *a
if (*s >= '0' && *s <= '9') {
char *end;
*argno = strtoul(s, &end, 0);
*argno = std::strtoul(s, &end, 0);
if (*end != ':') strgen_fatal("missing arg #");
s = end + 1;
}