diff --git a/src/openrct2/interface/InteractiveConsole.cpp b/src/openrct2/interface/InteractiveConsole.cpp index 14cda2b0ea..56962e45ad 100644 --- a/src/openrct2/interface/InteractiveConsole.cpp +++ b/src/openrct2/interface/InteractiveConsole.cpp @@ -1231,7 +1231,7 @@ static void ConsoleCommandShowLimits(InteractiveConsole& console, [[maybe_unused console.WriteFormatLine("Sprites: %d/%d", spriteCount, kMaxEntities); console.WriteFormatLine("Map Elements: %zu/%d", tileElementCount, kMaxTileElements); - console.WriteFormatLine("Banners: %d/%zu", bannerCount, MAX_BANNERS); + console.WriteFormatLine("Banners: %d/%zu", bannerCount, kMaxBanners); console.WriteFormatLine("Rides: %d/%d", rideCount, OpenRCT2::Limits::kMaxRidesInPark); console.WriteFormatLine("Images: %zu/%zu", ImageListGetUsedCount(), ImageListGetMaximum()); } diff --git a/src/openrct2/park/ParkFile.cpp b/src/openrct2/park/ParkFile.cpp index d0bf2285c5..1ecafc33b9 100644 --- a/src/openrct2/park/ParkFile.cpp +++ b/src/openrct2/park/ParkFile.cpp @@ -1302,7 +1302,7 @@ namespace OpenRCT2 cs.Write(static_cast(numBanners)); [[maybe_unused]] size_t numWritten = 0; - for (BannerIndex::UnderlyingType i = 0; i < MAX_BANNERS; i++) + for (BannerIndex::UnderlyingType i = 0; i < kMaxBanners; i++) { auto banner = GetBanner(BannerIndex::FromUnderlying(i)); if (banner != nullptr) diff --git a/src/openrct2/world/Banner.cpp b/src/openrct2/world/Banner.cpp index 60766b3e09..68d9be45c2 100644 --- a/src/openrct2/world/Banner.cpp +++ b/src/openrct2/world/Banner.cpp @@ -122,7 +122,7 @@ static RideId BannerGetRideIndexAt(const CoordsXYZ& bannerCoords) static BannerIndex BannerGetNewIndex() { auto& gameState = getGameState(); - for (BannerIndex::UnderlyingType bannerIndex = 0; bannerIndex < MAX_BANNERS; bannerIndex++) + for (BannerIndex::UnderlyingType bannerIndex = 0; bannerIndex < kMaxBanners; bannerIndex++) { if (bannerIndex < gameState.banners.size()) { @@ -417,7 +417,7 @@ Banner* GetOrCreateBanner(BannerIndex id) { auto& gameState = getGameState(); const auto index = id.ToUnderlying(); - if (index < MAX_BANNERS) + if (index < kMaxBanners) { if (index >= gameState.banners.size()) { @@ -488,5 +488,5 @@ size_t GetNumBanners() bool HasReachedBannerLimit() { auto numBanners = GetNumBanners(); - return numBanners >= MAX_BANNERS; + return numBanners >= kMaxBanners; } diff --git a/src/openrct2/world/Banner.h b/src/openrct2/world/Banner.h index 1cff9b85e3..c2ef9e81ae 100644 --- a/src/openrct2/world/Banner.h +++ b/src/openrct2/world/Banner.h @@ -26,7 +26,7 @@ namespace OpenRCT2 } constexpr ObjectEntryIndex BANNER_NULL = kObjectEntryIndexNull; -constexpr size_t MAX_BANNERS = 8192; +constexpr size_t kMaxBanners = 8192; constexpr uint8_t SCROLLING_MODE_NONE = 255;