From ae38d05ef878e933b7c796d454ef8a34b4b39575 Mon Sep 17 00:00:00 2001
From: Gymnasiast <m.o.steenbeek@gmail.com>
Date: Tue, 20 May 2025 22:58:34 +0200
Subject: [PATCH] Change BANNER_NULL to kBannerNull

---
 src/openrct2/actions/BannerPlaceAction.h | 2 +-
 src/openrct2/world/Banner.cpp            | 2 +-
 src/openrct2/world/Banner.h              | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/openrct2/actions/BannerPlaceAction.h b/src/openrct2/actions/BannerPlaceAction.h
index 38bff312a1..719d61969a 100644
--- a/src/openrct2/actions/BannerPlaceAction.h
+++ b/src/openrct2/actions/BannerPlaceAction.h
@@ -20,7 +20,7 @@ class BannerPlaceAction final : public GameActionBase<GameCommand::PlaceBanner>
 {
 private:
     CoordsXYZD _loc;
-    ObjectEntryIndex _bannerType{ BANNER_NULL };
+    ObjectEntryIndex _bannerType{ kBannerNull };
     uint8_t _primaryColour{};
 
 public:
diff --git a/src/openrct2/world/Banner.cpp b/src/openrct2/world/Banner.cpp
index 972d4b0db5..b6781dbd7e 100644
--- a/src/openrct2/world/Banner.cpp
+++ b/src/openrct2/world/Banner.cpp
@@ -288,7 +288,7 @@ static void BannerDeallocateUnlinked()
             auto* banner = GetBanner(bannerId);
             if (banner != nullptr)
             {
-                banner->type = BANNER_NULL;
+                banner->type = kBannerNull;
             }
         }
     }
diff --git a/src/openrct2/world/Banner.h b/src/openrct2/world/Banner.h
index 86ac4efe35..dfa5d125c0 100644
--- a/src/openrct2/world/Banner.h
+++ b/src/openrct2/world/Banner.h
@@ -25,7 +25,7 @@ namespace OpenRCT2
     struct GameState_t;
 }
 
-constexpr ObjectEntryIndex BANNER_NULL = kObjectEntryIndexNull;
+constexpr ObjectEntryIndex kBannerNull = kObjectEntryIndexNull;
 constexpr size_t kMaxBanners = 8192;
 
 constexpr uint8_t kScrollingModeNone = 255;
@@ -33,7 +33,7 @@ constexpr uint8_t kScrollingModeNone = 255;
 struct Banner
 {
     BannerIndex id = BannerIndex::GetNull();
-    ObjectEntryIndex type = BANNER_NULL;
+    ObjectEntryIndex type = kBannerNull;
     uint8_t flags{};
     std::string text;
     mutable std::string formattedTextBuffer;
@@ -44,7 +44,7 @@ struct Banner
 
     bool IsNull() const
     {
-        return type == BANNER_NULL;
+        return type == kBannerNull;
     }
 
     std::string GetText() const;