mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: replace instance of raw uint16_t with CompanyMask

pull/13512/head
Rubidium 2025-02-09 11:17:02 +01:00 committed by rubidium42
parent ec492cb267
commit 01b639bb23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/saveload/afterload.cpp
View File

@ -3197,16 +3197,16 @@ bool AfterLoadGame()
if (IsSavegameVersionBefore(SLV_GROUP_REPLACE_WAGON_REMOVAL)) { if (IsSavegameVersionBefore(SLV_GROUP_REPLACE_WAGON_REMOVAL)) {
/* Propagate wagon removal flag for compatibility */ /* Propagate wagon removal flag for compatibility */
/* Temporary bitmask of company wagon removal setting */ /* Temporary bitmask of company wagon removal setting */
uint16_t wagon_removal = 0; CompanyMask wagon_removal{};
for (const Company *c : Company::Iterate()) { for (const Company *c : Company::Iterate()) {
if (c->settings.renew_keep_length) SetBit(wagon_removal, c->index); if (c->settings.renew_keep_length) wagon_removal.Set(c->index);
} }
for (Group *g : Group::Iterate()) { for (Group *g : Group::Iterate()) {
if (g->flags != GroupFlags{}) { if (g->flags != GroupFlags{}) {
/* Convert old replace_protection value to flag. */ /* Convert old replace_protection value to flag. */
g->flags = GroupFlag::ReplaceProtection; g->flags = GroupFlag::ReplaceProtection;
} }
if (HasBit(wagon_removal, g->owner)) g->flags.Set(GroupFlag::ReplaceWagonRemoval); if (wagon_removal.Test(g->owner)) g->flags.Set(GroupFlag::ReplaceWagonRemoval);
} }
} }