mirrors/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD synced 2026-01-18 01:42:38 +01:00
Code Issues Releases Wiki Activity

Codechange: Replace strtol, strtoll, stroul and strtoull with ParseInteger.

Browse Source
This commit is contained in:
frosch
2025-04-29 17:00:55 +02:00
committed by frosch
parent cdafc50c94
commit 98481ecc01
8 changed files with 52 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/settings.cpp
View File

@@ -1010,10 +1010,26 @@ static void GraphicsSetLoadConfig(IniFile &ini)
if (const IniItem *item = group->GetItem("name"); item != nullptr && item->value) BaseGraphics::ini_data.name = *item->value;
if (const IniItem *item = group->GetItem("shortname"); item != nullptr && item->value && item->value->size() == 8) {
BaseGraphics::ini_data.shortname = std::byteswap<uint32_t>(std::strtoul(item->value->c_str(), nullptr, 16));
auto val = ParseInteger<uint32_t>(*item->value, 16);
if (val.has_value()) {
BaseGraphics::ini_data.shortname = std::byteswap<uint32_t>(*val);
} else {
ShowErrorMessage(GetEncodedString(STR_CONFIG_ERROR),
GetEncodedString(STR_CONFIG_ERROR_INVALID_VALUE, *item->value, BaseGraphics::ini_data.name),
WL_CRITICAL);
}
}
if (const IniItem *item = group->GetItem("extra_version"); item != nullptr && item->value) BaseGraphics::ini_data.extra_version = std::strtoul(item->value->c_str(), nullptr, 10);
if (const IniItem *item = group->GetItem("extra_version"); item != nullptr && item->value) {
auto val = ParseInteger<uint32_t>(*item->value);
if (val.has_value()) {
BaseGraphics::ini_data.extra_version = *val;
} else {
ShowErrorMessage(GetEncodedString(STR_CONFIG_ERROR),
GetEncodedString(STR_CONFIG_ERROR_INVALID_VALUE, *item->value, BaseGraphics::ini_data.name),
WL_CRITICAL);
}
}
if (const IniItem *item = group->GetItem("extra_params"); item != nullptr && item->value) {
auto params = ParseIntList(item->value->c_str());