gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-09 15:41:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: String gender scan with SCC_INDUSTRY_NAME (#11697)

Browse Source
This commit is contained in:
Jonathan G Rennison 2024-01-07 20:48:47 +00:00 committed by GitHub
parent 948651d086
commit 4b48d3b5fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/strings.cpp
View File

@ -1469,14 +1469,14 @@ static void FormatString(StringBuilder &builder, const char *str_arg, StringPara
if (i == nullptr) break;
static bool use_cache = true;
if (use_cache) { // Use cached version if first call
AutoRestoreBackup cache_backup(use_cache, false);
builder += i->GetCachedName();
} else if (_scan_for_gender_data) {
if (_scan_for_gender_data) {
/* Gender is defined by the industry type.
* STR_FORMAT_INDUSTRY_NAME may have the town first, so it would result in the gender of the town name */
auto tmp_params = ArrayStringParameters<0>();
FormatString(builder, GetStringPtr(GetIndustrySpec(i->type)->name), tmp_params, next_substr_case_index);
} else if (use_cache) { // Use cached version if first call
AutoRestoreBackup cache_backup(use_cache, false);
builder += i->GetCachedName();
} else {
/* First print the town name and the industry type name. */
auto tmp_params = MakeParameters(i->town->index, GetIndustrySpec(i->type)->name);