mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-06 06:32:56 +01:00
Code Issues Releases Wiki Activity

Change BANNER_NULL to kBannerNull

Browse Source
This commit is contained in:
Gymnasiast
2025-05-20 22:58:34 +02:00
parent ddacaacc71
commit ae38d05ef8
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/actions/BannerPlaceAction.h
View File

@@ -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:

2
src/openrct2/world/Banner.cpp
View File

@@ -288,7 +288,7 @@ static void BannerDeallocateUnlinked()
auto* banner = GetBanner(bannerId);
if (banner != nullptr)
{
banner->type = BANNER_NULL;
banner->type = kBannerNull;
}
}
}

6
src/openrct2/world/Banner.h
View File

@@ -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;