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

Codefix: std::string_view does not accept nullptr

pull/13937/head
Rubidium 2025-03-31 20:22:43 +02:00
parent dc956a758d
commit a0e0795e9e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/game_text.cpp
View File

@ -273,7 +273,7 @@ static void ExtractStringParams(const StringData &data, StringParamsList &params
if (*it == nullptr) { if (*it == nullptr) {
/* Skip empty param unless a non empty param exist after it. */ /* Skip empty param unless a non empty param exist after it. */
if (std::all_of(it, pcs.consuming_commands.end(), [](auto cs) { return cs == nullptr; })) break; if (std::all_of(it, pcs.consuming_commands.end(), [](auto cs) { return cs == nullptr; })) break;
param.emplace_back(StringParam::UNUSED, 1, nullptr); param.emplace_back(StringParam::UNUSED, 1);
continue; continue;
} }
const CmdStruct *cs = *it; const CmdStruct *cs = *it;

2
src/game/game_text.hpp
View File

@ -24,7 +24,7 @@ struct StringParam {
uint8_t consumes; uint8_t consumes;
std::string_view cmd; std::string_view cmd;
StringParam(ParamType type, uint8_t consumes, std::string_view cmd) : type(type), consumes(consumes), cmd(cmd) {} StringParam(ParamType type, uint8_t consumes, std::string_view cmd = {}) : type(type), consumes(consumes), cmd(cmd) {}
}; };
using StringParams = std::vector<StringParam>; using StringParams = std::vector<StringParam>;
using StringParamsList = std::vector<StringParams>; using StringParamsList = std::vector<StringParams>;