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

Codechange: Use EnumBitSet for CzechChooseFlags.

Browse Source
This commit is contained in:
Peter Nelson
2025-04-15 23:17:41 +01:00
committed by Peter Nelson
parent ea0817390f
commit 378ea52ac6
2 changed files with 87 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/townname.cpp
View File

@@ -602,7 +602,7 @@ static void MakeCzechTownName(StringBuilder &builder, uint32_t seed)
/* The select criteria. */
CzechGender gender;
CzechChoose choose;
CzechChooseFlags choose;
CzechAllowFlags allow;
if (do_prefix) prefix = SeedModChance(5, std::size(_name_czech_adj) * 12, seed) / 12;
@@ -632,18 +632,18 @@ static void MakeCzechTownName(StringBuilder &builder, uint32_t seed)
/* Load the postfix (1:1 chance that a postfix will be inserted) */
postfix = SeedModChance(14, std::size(_name_czech_subst_postfix) * 2, seed);
if (choose & CZC_POSTFIX) {
if (choose.Test(CzechChooseFlag::Postfix)) {
/* Always get a real postfix. */
postfix %= std::size(_name_czech_subst_postfix);
}
if (choose & CZC_NOPOSTFIX) {
if (choose.Test(CzechChooseFlag::NoPostfix)) {
/* Always drop a postfix. */
postfix += std::size(_name_czech_subst_postfix);
}
if (postfix < std::size(_name_czech_subst_postfix)) {
choose |= CZC_POSTFIX;
choose.Set(CzechChooseFlag::Postfix);
} else {
choose |= CZC_NOPOSTFIX;
choose.Set(CzechChooseFlag::NoPostfix);
}
/* Localize the array segment containing a good gender */