mirrors/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD synced 2026-01-21 03:12:41 +01:00
Code Issues Releases Wiki Activity

Codechange: Use EnumBitSet for StringValidationSettings. (#13974)

Browse Source
This commit is contained in:
Peter Nelson
2025-04-08 21:19:17 +01:00
committed by GitHub
parent 4e4f413913
commit 5b9d171e63
15 changed files with 38 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/script/api/script_object.hpp
View File

@@ -353,7 +353,7 @@ namespace ScriptObjectInternal {
if constexpr (std::is_same_v<std::string, T>) {
/* The string must be valid, i.e. not contain special codes. Since some
* can be made with GSText, make sure the control codes are removed. */
::StrMakeValidInPlace(data, SVS_NONE);
::StrMakeValidInPlace(data, {});
}
}

2
src/script/api/script_text.cpp
View File

@@ -204,7 +204,7 @@ void ScriptText::ParamCheck::Encode(std::back_insert_iterator<std::string> &outp
void operator()(std::string value)
{
Utf8Encode(this->output, SCC_ENCODED_STRING);
StrMakeValidInPlace(value, SVS_REPLACE_WITH_QUESTION_MARK | SVS_ALLOW_NEWLINE | SVS_REPLACE_TAB_CR_NL_WITH_SPACE);
StrMakeValidInPlace(value, {StringValidationSetting::ReplaceWithQuestionMark, StringValidationSetting::AllowNewline, StringValidationSetting::ReplaceTabCrNlWithSpace});
fmt::format_to(this->output, "{}", value);
}