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 using ParkEntranceIndex = TIdentifier::max(), struct ParkEntranceIndexTag>; + +using BannerIndex = TIdentifier::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(-1); constexpr uint8_t SCROLLING_MODE_NONE = 255;