From ee53f1db660b95d1fb1446a6a086f39067d2346f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Wed, 24 Nov 2021 19:35:21 +0200
Subject: [PATCH] Use TIdentifier for BannerIndex

---
 src/openrct2/Identifiers.h  | 3 +++
 src/openrct2/world/Banner.h | 4 +---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/openrct2/Identifiers.h b/src/openrct2/Identifiers.h
index d4e2f1c557..076b26b2e2 100644
--- a/src/openrct2/Identifiers.h
+++ b/src/openrct2/Identifiers.h
@@ -15,3 +15,6 @@
 #include <limits>
 
 using ParkEntranceIndex = TIdentifier<uint8_t, std::numeric_limits<uint8_t>::max(), struct ParkEntranceIndexTag>;
+
+using BannerIndex = TIdentifier<uint16_t, std::numeric_limits<uint16_t>::max(), struct BannerIndexTag>;
+constexpr BannerIndex BANNER_INDEX_NULL = BannerIndex::GetNull();
diff --git a/src/openrct2/world/Banner.h b/src/openrct2/world/Banner.h
index e4ad35c2ec..81cef113c3 100644
--- a/src/openrct2/world/Banner.h
+++ b/src/openrct2/world/Banner.h
@@ -9,6 +9,7 @@
 
 #pragma once
 
+#include "../Identifiers.h"
 #include "../common.h"
 #include "../ride/RideTypes.h"
 #include "Location.hpp"
@@ -19,11 +20,8 @@ class Formatter;
 struct TileElement;
 struct WallElement;
 
-using BannerIndex = uint16_t;
-
 constexpr ObjectEntryIndex BANNER_NULL = OBJECT_ENTRY_INDEX_NULL;
 constexpr size_t MAX_BANNERS = 8192;
-constexpr BannerIndex BANNER_INDEX_NULL = static_cast<BannerIndex>(-1);
 
 constexpr uint8_t SCROLLING_MODE_NONE = 255;