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

Codechange: Change internal format of encoded strings to improve robustness and allow expansion. (#13499)

Browse Source
This commit is contained in:
Peter Nelson
2025-02-09 12:45:50 +00:00
committed by GitHub
parent 1193852007
commit dccc6185b9
7 changed files with 241 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/string.cpp
View File

@@ -90,6 +90,24 @@ std::string FormatArrayAsHex(std::span<const uint8_t> data)
return str;
}
/**
* Test if a character is (only) part of an encoded string.
* @param c Character to test.
* @returns True iff the character is an encoded string control code.
*/
static bool IsSccEncodedCode(char32_t c)
{
switch (c) {
case SCC_RECORD_SEPARATOR:
case SCC_ENCODED:
case SCC_ENCODED_NUMERIC:
case SCC_ENCODED_STRING:
return true;
default:
return false;
}
}
/**
* Copies the valid (UTF-8) characters from \c str up to \c last to the \c dst.
@@ -140,7 +158,7 @@ static void StrMakeValid(T &dst, const char *str, const char *last, StringValida
continue;
}
if ((IsPrintable(c) && (c < SCC_SPRITE_START || c > SCC_SPRITE_END)) || ((settings & SVS_ALLOW_CONTROL_CODE) != 0 && c == SCC_ENCODED)) {
if ((IsPrintable(c) && (c < SCC_SPRITE_START || c > SCC_SPRITE_END)) || ((settings & SVS_ALLOW_CONTROL_CODE) != 0 && IsSccEncodedCode(c))) {
/* Copy the character back. Even if dst is current the same as str
* (i.e. no characters have been changed) this is quicker than
* moving the pointers ahead by len */