miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Codechange: Use GetString() with local parameters in script functions. (#13585)

Browse Source
This commit is contained in:
Peter Nelson
2025-02-16 21:27:25 +00:00
committed by GitHub
parent fd4adc55e3
commit 154896ce55
18 changed files with 19 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/script/api/script_company.cpp
View File

@@ -77,8 +77,7 @@
company = ResolveCompanyID(company);
if (company == ScriptCompany::COMPANY_INVALID) return std::nullopt;
::SetDParam(0, ScriptCompany::FromScriptCompanyID(company));
return GetString(STR_COMPANY_NAME);
return ::StrMakeValid(::GetString(STR_COMPANY_NAME, ScriptCompany::FromScriptCompanyID(company)));
}
/* static */ bool ScriptCompany::SetPresidentName(Text *name)
@@ -99,8 +98,7 @@
company = ResolveCompanyID(company);
if (company == ScriptCompany::COMPANY_INVALID) return std::nullopt;
::SetDParam(0, ScriptCompany::FromScriptCompanyID(company));
return GetString(STR_PRESIDENT_NAME);
return ::StrMakeValid(::GetString(STR_PRESIDENT_NAME, ScriptCompany::FromScriptCompanyID(company)));
}
/* static */ bool ScriptCompany::SetPresidentGender(Gender gender)