From e12c18a1f478e8178d17c099bb3773774d0ac8a2 Mon Sep 17 00:00:00 2001 From: Harry-Hopkinson Date: Wed, 5 Jun 2024 20:31:57 +0000 Subject: [PATCH] Rename Num_LL_CSG_Entries to kNumLlCsgEntries --- src/openrct2/rct1/Csg.cpp | 2 +- src/openrct2/rct1/Limits.h | 2 +- src/openrct2/sprites.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/openrct2/rct1/Csg.cpp b/src/openrct2/rct1/Csg.cpp index db404f20c3..48d4e2b220 100644 --- a/src/openrct2/rct1/Csg.cpp +++ b/src/openrct2/rct1/Csg.cpp @@ -63,7 +63,7 @@ bool RCT1DataPresentAtLocation(u8string_view path) bool CsgIsUsable(const Gx& csg) { return csg.header.total_size == RCT1::Limits::LL_CSG1_DAT_FileSize - && csg.header.num_entries == RCT1::Limits::Num_LL_CSG_Entries; + && csg.header.num_entries == RCT1::Limits::kNumLlCsgEntries; } bool CsgAtLocationIsUsable(u8string_view path) diff --git a/src/openrct2/rct1/Limits.h b/src/openrct2/rct1/Limits.h index d2ac180623..88468fa8dd 100644 --- a/src/openrct2/rct1/Limits.h +++ b/src/openrct2/rct1/Limits.h @@ -21,7 +21,7 @@ namespace RCT1::Limits constexpr uint16_t kMaxAnimatedObjects = 1000; constexpr uint8_t kMaxBanners = 100; constexpr int32_t kCoordsZStep = 4; - constexpr uint32_t Num_LL_CSG_Entries = 69917; + constexpr uint32_t kNumLlCsgEntries = 69917; constexpr uint32_t LL_CSG1_DAT_FileSize = 41402869; constexpr uint32_t NumTerrainSurfaces = 16; constexpr uint32_t NumTerrainEdges = 15; diff --git a/src/openrct2/sprites.h b/src/openrct2/sprites.h index eb66c77299..6c9bcb53be 100644 --- a/src/openrct2/sprites.h +++ b/src/openrct2/sprites.h @@ -1517,7 +1517,7 @@ enum SPR_G2_END, SPR_CSG_BEGIN = SPR_G2_END, - SPR_CSG_END = SPR_CSG_BEGIN + RCT1::Limits::Num_LL_CSG_Entries, + SPR_CSG_END = SPR_CSG_BEGIN + RCT1::Limits::kNumLlCsgEntries, G2_SPRITE_COUNT = SPR_G2_END - SPR_G2_BEGIN,