Rename MaxEntitiesRCTCExtended to kMaxEntitiesRCTCExtended

OpenRCT2 · Jun 6, 2024 · a8c29cd · a8c29cd
1 parent c1788bd
commit a8c29cd
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/openrct2/rct2/Limits.h b/src/openrct2/rct2/Limits.h
@@ -19,7 +19,7 @@ namespace RCT2::Limits
  constexpr uint8_t kMaxVehicleColours = 32;
  constexpr uint8_t kDowntimeHistorySize = 8;
  constexpr uint16_t kMaxEntities = 10000;
- constexpr uint16_t MaxEntitiesRCTCExtended = 15000; // Used in files marked with “classic flag” 0xF
+ constexpr uint16_t kMaxEntitiesRCTCExtended = 15000; // Used in files marked with “classic flag” 0xF
  constexpr uint32_t kMaxTileElements = 0x30000;
  constexpr uint16_t kMaxAnimatedObjects = 2000;
  constexpr uint8_t kMaxResearchedRideTypeQuads = 8; // With 32 bits per uint32_t, this means there is room for

diff --git a/src/openrct2/rct2/RCT2.h b/src/openrct2/rct2/RCT2.h
@@ -846,7 +846,7 @@ namespace RCT2
 
  // SC6[6]
  uint32_t NextFreeTileElementPointerIndex;
- Entity Entities[Limits::MaxEntitiesRCTCExtended];
+ Entity Entities[Limits::kMaxEntitiesRCTCExtended];
  uint16_t EntityListsHead[EnumValue(EntityListId::Count)];
  uint16_t EntityListsCount[EnumValue(EntityListId::Count)];
  StringId ParkName;

diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp
@@ -2217,7 +2217,7 @@ namespace RCT2
 
  uint16_t GetMaxEntities()
  {
- return (_s6.Header.ClassicFlag == 0xf) ? Limits::MaxEntitiesRCTCExtended : Limits::kMaxEntities;
+ return (_s6.Header.ClassicFlag == 0xf) ? Limits::kMaxEntitiesRCTCExtended : Limits::kMaxEntities;
  }
 
  template<typename OpenRCT2_T> void ImportEntity(const RCT12EntityBase& src);

diff --git a/src/openrct2/ride/coaster/CorkscrewRollerCoaster.hpp b/src/openrct2/ride/coaster/CorkscrewRollerCoaster.hpp
@@ -28,7 +28,7 @@ static constexpr uint32_t kCorkscrewRcBlockBrakeNwSeOpen = 16233;
 static constexpr uint32_t kCorkscrewRcBlockBrakeSwNeClosed = 16234;
 static constexpr uint32_t kCorkscrewRcBlockBrakeNwSeClosed = 16235;
 
-static constexpr uint32_t _kCorkscrewRcBlockBrakeImages[NumOrthogonalDirections][2] = {
+static constexpr uint32_t kCorkscrewRcBlockBrakeImages[NumOrthogonalDirections][2] = {
  { kCorkscrewRcBlockBrakeSwNeOpen, kCorkscrewRcBlockBrakeSwNeClosed },
  { kCorkscrewRcBlockBrakeNwSeOpen, kCorkscrewRcBlockBrakeNwSeClosed },
  { kCorkscrewRcBlockBrakeSwNeOpen, kCorkscrewRcBlockBrakeSwNeClosed },
@@ -137,7 +137,7 @@ static void CorkscrewRCTrackStation(
  {
  bool isClosed = trackElement.IsBrakeClosed();
  PaintAddImageAsParentRotated(
- session, direction, session.TrackColours.WithIndex(_kCorkscrewRcBlockBrakeImages[direction][isClosed]),
+ session, direction, session.TrackColours.WithIndex(kCorkscrewRcBlockBrakeImages[direction][isClosed]),
  { 0, 0, height }, { { 0, 6, height + 3 }, { 32, 20, 1 } });
  }
  else
@@ -9923,8 +9923,8 @@ static void CorkscrewRCTrackBlockBrakes(
 {
  bool isClosed = trackElement.IsBrakeClosed();
  PaintAddImageAsParentRotated(
- session, direction, session.TrackColours.WithIndex(_kCorkscrewRcBlockBrakeImages[direction][isClosed]),
- { 0, 0, height }, { { 0, 6, height }, { 32, 20, 3 } });
+ session, direction, session.TrackColours.WithIndex(kCorkscrewRcBlockBrakeImages[direction][isClosed]), { 0, 0, height },
+ { { 0, 6, height }, { 32, 20, 3 } });
  MetalASupportsPaintSetup(session, supportType, MetalSupportPlace::Centre, 0, height, session.SupportColours);
  PaintUtilPushTunnelRotated(session, direction, height, TunnelType::StandardFlat);
  PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(BlockedSegments::kStraightFlat, direction), 0xFFFF, 0);