mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: Remove unnecessary string constructions. (#14063)

pull/14060/head
frosch 2025-04-21 16:46:31 +02:00 committed by GitHub
parent e1fdc10227
commit 354ad43edb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/newgrf_gui.cpp
View File

@ -260,7 +260,7 @@ struct NewGRFParametersWindow : public Window {
auto it = std::ranges::lower_bound(par_info.value_names, value, std::less{}, &GRFParameterInfo::ValueName::first); auto it = std::ranges::lower_bound(par_info.value_names, value, std::less{}, &GRFParameterInfo::ValueName::first);
if (it != std::end(par_info.value_names) && it->first == value) { if (it != std::end(par_info.value_names) && it->first == value) {
if (auto label = GetGRFStringFromGRFText(it->second); label.has_value()) return {STR_JUST_RAW_STRING, std::string(*label)}; if (auto label = GetGRFStringFromGRFText(it->second); label.has_value()) return {STR_JUST_RAW_STRING, *label};
} }
return {STR_JUST_INT, value}; return {STR_JUST_INT, value};

4
src/strings.cpp
View File

@ -185,7 +185,7 @@ EncodedString EncodedString::ReplaceParam(size_t param, StringParameter &&data)
} }
case SCC_ENCODED_STRING: { case SCC_ENCODED_STRING: {
params.emplace_back(std::string(record.Read(StringConsumer::npos))); params.emplace_back(record.Read(StringConsumer::npos));
break; break;
} }
@ -1037,7 +1037,7 @@ static void DecodeEncodedString(StringConsumer &consumer, bool game_script, Stri
} }
case SCC_ENCODED_STRING: { case SCC_ENCODED_STRING: {
sub_args.emplace_back(std::string(record.Read(StringConsumer::npos))); sub_args.emplace_back(record.Read(StringConsumer::npos));
break; break;
} }