dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Strings: Exit early when scanning for gender data

Browse Source
This commit is contained in:
Jonathan G Rennison
2024-01-06 17:54:42 +00:00
parent 1100e83192
commit dcd71f5ab8
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/strings.cpp
View File

@@ -1128,6 +1128,11 @@ static void FormatString(StringBuilder builder, const char *str_arg, StringParam
if (str_stack.empty()) break; if (str_stack.empty()) break;
const char *&str = str_stack.top(); const char *&str = str_stack.top();
if (_scan_for_gender_data && !builder.GetTargetString()->empty()) {
/* Early exit when scanning for gender data if target string is already non-empty */
return;
}
if (SCC_NEWGRF_FIRST <= b && b <= SCC_NEWGRF_LAST) { if (SCC_NEWGRF_FIRST <= b && b <= SCC_NEWGRF_LAST) {
/* We need to pass some stuff as it might be modified. */ /* We need to pass some stuff as it might be modified. */
StringParameters remaining = args.GetRemainingParameters(); StringParameters remaining = args.GetRemainingParameters();
@@ -1276,6 +1281,7 @@ static void FormatString(StringBuilder builder, const char *str_arg, StringParam
if (_scan_for_gender_data) { if (_scan_for_gender_data) {
builder.Utf8Encode(SCC_GENDER_INDEX); builder.Utf8Encode(SCC_GENDER_INDEX);
builder += *str++; builder += *str++;
return; // Exit early
} else { } else {
str++; str++;
} }