From 01b639bb2303d89a5cca1e0718f2759e124bc51d Mon Sep 17 00:00:00 2001 From: Rubidium Date: Sun, 9 Feb 2025 11:17:02 +0100 Subject: [PATCH] Codechange: replace instance of raw uint16_t with CompanyMask --- src/saveload/afterload.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp index cbca3852cf..ccf60c4777 100644 --- a/src/saveload/afterload.cpp +++ b/src/saveload/afterload.cpp @@ -3197,16 +3197,16 @@ bool AfterLoadGame() if (IsSavegameVersionBefore(SLV_GROUP_REPLACE_WAGON_REMOVAL)) { /* Propagate wagon removal flag for compatibility */ /* Temporary bitmask of company wagon removal setting */ - uint16_t wagon_removal = 0; + CompanyMask wagon_removal{}; 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()) { if (g->flags != GroupFlags{}) { /* Convert old replace_protection value to flag. */ 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); } }