From 95b43684d0f70b8e93e8990cb8b107e72e817455 Mon Sep 17 00:00:00 2001 From: Tulio Leao Date: Sat, 18 Apr 2020 09:34:07 -0300 Subject: [PATCH] Change advertise campaign variable type to avoid casts (#11333) --- src/openrct2/rct1/S4Importer.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index 8872f8db36..fe06803ff1 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -1810,12 +1810,15 @@ private: gTotalIncomeFromAdmissions = _s4.admission_total_income; // TODO marketing campaigns not working - for (size_t i = 0; i < ADVERTISING_CAMPAIGN_COUNT; i++) + static_assert( + std::numeric_limits::max() > ADVERTISING_CAMPAIGN_COUNT, + "Advertising enum bigger than capacity of iterator"); + for (uint8_t i = 0; i < ADVERTISING_CAMPAIGN_COUNT; i++) { if (_s4.marketing_status[i] & CAMPAIGN_ACTIVE_FLAG) { MarketingCampaign campaign; - campaign.Type = static_cast(i); + campaign.Type = i; campaign.WeeksLeft = _s4.marketing_status[i] & ~CAMPAIGN_ACTIVE_FLAG; if (campaign.Type == ADVERTISING_CAMPAIGN_RIDE_FREE || campaign.Type == ADVERTISING_CAMPAIGN_RIDE) {