diff --git a/src/openrct2-ui/interface/LandTool.cpp b/src/openrct2-ui/interface/LandTool.cpp index f884fece36..ea1853b5bd 100644 --- a/src/openrct2-ui/interface/LandTool.cpp +++ b/src/openrct2-ui/interface/LandTool.cpp @@ -59,7 +59,7 @@ void LandTool::ShowSurfaceStyleDropdown(WindowBase* w, Widget* widget, ObjectEnt auto defaultIndex = 0; auto itemIndex = 0; - for (size_t i = 0; i < MAX_TERRAIN_SURFACE_OBJECTS; i++) + for (size_t i = 0; i < kMaxTerrainSurfaceObjects; i++) { const auto surfaceObj = static_cast(objManager.GetLoadedObject(ObjectType::TerrainSurface, i)); // If fallback images are loaded, the RCT1 styles will just look like copies of already existing styles, so hide them. @@ -91,7 +91,7 @@ ObjectEntryIndex LandTool::GetSurfaceStyleFromDropdownIndex(size_t index) { auto& objManager = GetContext()->GetObjectManager(); auto itemIndex = 0U; - for (size_t i = 0; i < MAX_TERRAIN_SURFACE_OBJECTS; i++) + for (size_t i = 0; i < kMaxTerrainSurfaceObjects; i++) { const auto surfaceObj = static_cast(objManager.GetLoadedObject(ObjectType::TerrainSurface, i)); // If fallback images are loaded, the RCT1 styles will just look like copies of already existing styles, so hide them. @@ -113,7 +113,7 @@ void LandTool::ShowEdgeStyleDropdown(WindowBase* w, Widget* widget, ObjectEntryI auto defaultIndex = 0; auto itemIndex = 0; - for (size_t i = 0; i < MAX_TERRAIN_EDGE_OBJECTS; i++) + for (size_t i = 0; i < kMaxTerrainEdgeObjects; i++) { const auto edgeObj = static_cast(objManager.GetLoadedObject(ObjectType::TerrainEdge, i)); // If fallback images are loaded, the RCT1 styles will just look like copies of already existing styles, so hide them. @@ -142,7 +142,7 @@ ObjectEntryIndex LandTool::GetEdgeStyleFromDropdownIndex(size_t index) { auto& objManager = GetContext()->GetObjectManager(); auto itemIndex = 0U; - for (size_t i = 0; i < MAX_TERRAIN_EDGE_OBJECTS; i++) + for (size_t i = 0; i < kMaxTerrainEdgeObjects; i++) { const auto edgeObj = static_cast(objManager.GetLoadedObject(ObjectType::TerrainEdge, i)); // If fallback images are loaded, the RCT1 styles will just look like copies of already existing styles, so hide them. diff --git a/src/openrct2-ui/windows/EditorParkEntrance.cpp b/src/openrct2-ui/windows/EditorParkEntrance.cpp index 47a84eb4e7..fbb16e0916 100644 --- a/src/openrct2-ui/windows/EditorParkEntrance.cpp +++ b/src/openrct2-ui/windows/EditorParkEntrance.cpp @@ -74,7 +74,7 @@ namespace OpenRCT2::Ui::Windows void InitParkEntranceItems() { _entranceTypes.clear(); - for (ObjectEntryIndex objectIndex = 0; objectIndex < MAX_PARK_ENTRANCE_OBJECTS; objectIndex++) + for (ObjectEntryIndex objectIndex = 0; objectIndex < kMaxParkEntranceObjects; objectIndex++) { auto& objManager = GetContext()->GetObjectManager(); auto* object = static_cast(objManager.GetLoadedObject(ObjectType::ParkEntrance, objectIndex)); diff --git a/src/openrct2-ui/windows/Footpath.cpp b/src/openrct2-ui/windows/Footpath.cpp index e0885de888..a10b5dfefc 100644 --- a/src/openrct2-ui/windows/Footpath.cpp +++ b/src/openrct2-ui/windows/Footpath.cpp @@ -626,7 +626,7 @@ static constexpr uint8_t ConstructionPreviewImages[][4] = { _dropdownEntries.clear(); std::optional defaultIndex; - for (ObjectEntryIndex i = 0; i < MAX_FOOTPATH_SURFACE_OBJECTS; i++) + for (ObjectEntryIndex i = 0; i < kMaxFootpathSurfaceObjects; i++) { const auto* pathType = static_cast( objManager.GetLoadedObject(ObjectType::FootpathSurface, i)); @@ -665,7 +665,7 @@ static constexpr uint8_t ConstructionPreviewImages[][4] = { numPathTypes++; } - for (ObjectEntryIndex i = 0; i < MAX_PATH_OBJECTS; i++) + for (ObjectEntryIndex i = 0; i < kMaxPathObjects; i++) { auto* pathObj = static_cast(objManager.GetLoadedObject(ObjectType::Paths, i)); if (pathObj == nullptr) @@ -706,7 +706,7 @@ static constexpr uint8_t ConstructionPreviewImages[][4] = { _dropdownEntries.clear(); std::optional defaultIndex; - for (int32_t i = 0; i < MAX_FOOTPATH_RAILINGS_OBJECTS; i++) + for (int32_t i = 0; i < kMaxFootpathRailingsObjects; i++) { const auto* railingsEntry = GetPathRailingsEntry(i); if (railingsEntry == nullptr) diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index 624f668090..ae5435f85d 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -2025,7 +2025,7 @@ static_assert(std::size(RatingNames) == 6); auto& objManager = GetContext()->GetObjectManager(); - for (ObjectEntryIndex i = 0; i < MAX_STATION_OBJECTS; i++) + for (ObjectEntryIndex i = 0; i < kMaxStationObjects; i++) { auto stationObj = static_cast(objManager.GetLoadedObject(ObjectType::Station, i)); if (stationObj != nullptr) @@ -4899,7 +4899,7 @@ static_assert(std::size(RatingNames) == 6); auto& musicOrder = window_ride_current_music_style_order; musicOrder.clear(); auto& objManager = GetContext()->GetObjectManager(); - for (ObjectEntryIndex i = 0; i < MAX_MUSIC_OBJECTS; i++) + for (ObjectEntryIndex i = 0; i < kMaxMusicObjects; i++) { auto musicObj = static_cast(objManager.GetLoadedObject(ObjectType::Music, i)); if (musicObj != nullptr) diff --git a/src/openrct2-ui/windows/Scenery.cpp b/src/openrct2-ui/windows/Scenery.cpp index a605ba551b..90678c0439 100644 --- a/src/openrct2-ui/windows/Scenery.cpp +++ b/src/openrct2-ui/windows/Scenery.cpp @@ -985,7 +985,7 @@ static Widget WindowSceneryBaseWidgets[] = { _tabEntries.emplace_back(SceneryWindow::SceneryTabInfo{ SCENERY_TAB_TYPE_ALL }); // small scenery - for (ObjectEntryIndex sceneryId = 0; sceneryId < MAX_SMALL_SCENERY_OBJECTS; sceneryId++) + for (ObjectEntryIndex sceneryId = 0; sceneryId < kMaxSmallSceneryObjects; sceneryId++) { const auto* sceneryEntry = OpenRCT2::ObjectManager::GetObjectEntry(sceneryId); if (sceneryEntry != nullptr) @@ -995,7 +995,7 @@ static Widget WindowSceneryBaseWidgets[] = { } // large scenery - for (ObjectEntryIndex sceneryId = 0; sceneryId < MAX_LARGE_SCENERY_OBJECTS; sceneryId++) + for (ObjectEntryIndex sceneryId = 0; sceneryId < kMaxLargeSceneryObjects; sceneryId++) { const auto* sceneryEntry = OpenRCT2::ObjectManager::GetObjectEntry(sceneryId); if (sceneryEntry != nullptr) @@ -1005,7 +1005,7 @@ static Widget WindowSceneryBaseWidgets[] = { } // walls - for (ObjectEntryIndex sceneryId = 0; sceneryId < MAX_WALL_SCENERY_OBJECTS; sceneryId++) + for (ObjectEntryIndex sceneryId = 0; sceneryId < kMaxWallSceneryObjects; sceneryId++) { const auto* sceneryEntry = OpenRCT2::ObjectManager::GetObjectEntry(sceneryId); if (sceneryEntry != nullptr) @@ -1015,7 +1015,7 @@ static Widget WindowSceneryBaseWidgets[] = { } // banners - for (ObjectEntryIndex sceneryId = 0; sceneryId < MAX_BANNER_OBJECTS; sceneryId++) + for (ObjectEntryIndex sceneryId = 0; sceneryId < kMaxBannerObjects; sceneryId++) { const auto* sceneryEntry = OpenRCT2::ObjectManager::GetObjectEntry(sceneryId); if (sceneryEntry != nullptr) @@ -1024,7 +1024,7 @@ static Widget WindowSceneryBaseWidgets[] = { } } - for (ObjectEntryIndex sceneryId = 0; sceneryId < MAX_PATH_ADDITION_OBJECTS; sceneryId++) + for (ObjectEntryIndex sceneryId = 0; sceneryId < kMaxPathAdditionObjects; sceneryId++) { const auto* sceneryEntry = OpenRCT2::ObjectManager::GetObjectEntry(sceneryId); if (sceneryEntry != nullptr) diff --git a/src/openrct2/actions/LargeSceneryPlaceAction.cpp b/src/openrct2/actions/LargeSceneryPlaceAction.cpp index a931fd1b5b..b7a244fa1f 100644 --- a/src/openrct2/actions/LargeSceneryPlaceAction.cpp +++ b/src/openrct2/actions/LargeSceneryPlaceAction.cpp @@ -87,7 +87,7 @@ GameActions::Result LargeSceneryPlaceAction::Query() const LOG_ERROR("Invalid tertiary colour %u", _tertiaryColour); return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_POSITION_THIS_HERE, STR_ERR_INVALID_COLOUR); } - else if (_sceneryType >= MAX_LARGE_SCENERY_OBJECTS) + else if (_sceneryType >= kMaxLargeSceneryObjects) { LOG_ERROR("Invalid sceneryType %u", _sceneryType); return GameActions::Result( diff --git a/src/openrct2/actions/RideCreateAction.cpp b/src/openrct2/actions/RideCreateAction.cpp index 04333589a0..8190abe0bc 100644 --- a/src/openrct2/actions/RideCreateAction.cpp +++ b/src/openrct2/actions/RideCreateAction.cpp @@ -88,7 +88,7 @@ GameActions::Result RideCreateAction::Query() const } int32_t rideEntryIndex = RideGetEntryIndex(_rideType, _subType); - if (rideEntryIndex >= MAX_RIDE_OBJECTS) + if (rideEntryIndex >= kMaxRideObjects) { LOG_ERROR("Ride entry not found for rideType %d, subType %d", _rideType, _subType); return GameActions::Result( diff --git a/src/openrct2/entity/Staff.cpp b/src/openrct2/entity/Staff.cpp index b4ab2585de..21d2ada429 100644 --- a/src/openrct2/entity/Staff.cpp +++ b/src/openrct2/entity/Staff.cpp @@ -1008,7 +1008,7 @@ GameActions::Result StaffSetColour(StaffType staffType, colour_t value) uint32_t StaffGetAvailableEntertainerCostumes() { uint32_t entertainerCostumes = 0; - for (int32_t i = 0; i < MAX_SCENERY_GROUP_OBJECTS; i++) + for (int32_t i = 0; i < kMaxSceneryGroupObjects; i++) { if (SceneryGroupIsInvented(i)) { diff --git a/src/openrct2/management/Research.cpp b/src/openrct2/management/Research.cpp index 3e149d4628..f4a562d23c 100644 --- a/src/openrct2/management/Research.cpp +++ b/src/openrct2/management/Research.cpp @@ -53,7 +53,7 @@ static constexpr int32_t _researchRate[] = { }; static bool _researchedRideTypes[RIDE_TYPE_COUNT]; -static bool _researchedRideEntries[MAX_RIDE_OBJECTS]; +static bool _researchedRideEntries[kMaxRideObjects]; static bool _researchedSceneryItems[SCENERY_TYPE_COUNT][UINT16_MAX]; bool gSilentResearch = false; @@ -215,7 +215,7 @@ void ResearchFinishItem(const ResearchItem& researchItem) RideTypeSetInvented(base_ride_type); RideEntrySetInvented(rideEntryIndex); - bool seenRideEntry[MAX_RIDE_OBJECTS]{}; + bool seenRideEntry[kMaxRideObjects]{}; for (auto const& researchItem3 : gameState.ResearchItemsUninvented) { ObjectEntryIndex index = researchItem3.entryIndex; @@ -224,7 +224,7 @@ void ResearchFinishItem(const ResearchItem& researchItem) // RCT2 made non-separated vehicles available at once, by removing all but one from research. // To ensure old files keep working, look for ride entries not in research, and make them available as well. - for (int32_t i = 0; i < MAX_RIDE_OBJECTS; i++) + for (int32_t i = 0; i < kMaxRideObjects; i++) { if (!seenRideEntry[i]) { @@ -465,7 +465,7 @@ void ResearchPopulateListRandom() ResearchResetItems(gameState); // Rides - for (int32_t i = 0; i < MAX_RIDE_OBJECTS; i++) + for (int32_t i = 0; i < kMaxRideObjects; i++) { const auto* rideEntry = GetRideEntryByIndex(i); if (rideEntry == nullptr) @@ -485,7 +485,7 @@ void ResearchPopulateListRandom() } // Scenery - for (uint32_t i = 0; i < MAX_SCENERY_GROUP_OBJECTS; i++) + for (uint32_t i = 0; i < kMaxSceneryGroupObjects; i++) { const auto* sceneryGroupEntry = OpenRCT2::ObjectManager::GetObjectEntry(i); if (sceneryGroupEntry == nullptr) @@ -665,7 +665,7 @@ void SceneryGroupSetInvented(int32_t sgIndex) void SetAllSceneryGroupsNotInvented() { - for (int32_t i = 0; i < MAX_SCENERY_GROUP_OBJECTS; ++i) + for (int32_t i = 0; i < kMaxSceneryGroupObjects; ++i) { const auto* scenery_set = OpenRCT2::ObjectManager::GetObjectEntry(i); if (scenery_set == nullptr) @@ -834,7 +834,7 @@ static void ResearchAddAllMissingItems(bool isResearched) { auto& gameState = GetGameState(); // Mark base ridetypes as seen if they exist in the invented research list. - bool seenBaseEntry[MAX_RIDE_OBJECTS]{}; + bool seenBaseEntry[kMaxRideObjects]{}; for (auto const& researchItem : gameState.ResearchItemsInvented) { ObjectEntryIndex index = researchItem.baseRideType; @@ -842,7 +842,7 @@ static void ResearchAddAllMissingItems(bool isResearched) } // Unlock and add research entries to the invented list for ride types whose base ridetype has been seen. - for (ObjectEntryIndex i = 0; i < MAX_RIDE_OBJECTS; i++) + for (ObjectEntryIndex i = 0; i < kMaxRideObjects; i++) { const auto* rideEntry = GetRideEntryByIndex(i); if (rideEntry != nullptr) @@ -868,7 +868,7 @@ static void ResearchAddAllMissingItems(bool isResearched) // Only add Rides to uninvented research that haven't had their base ridetype seen. // This prevents rct2 grouped rides from only unlocking the first train. - for (ObjectEntryIndex i = 0; i < MAX_RIDE_OBJECTS; i++) + for (ObjectEntryIndex i = 0; i < kMaxRideObjects; i++) { const auto* rideEntry = GetRideEntryByIndex(i); if (rideEntry != nullptr) @@ -889,7 +889,7 @@ static void ResearchAddAllMissingItems(bool isResearched) } } - for (ObjectEntryIndex i = 0; i < MAX_SCENERY_GROUP_OBJECTS; i++) + for (ObjectEntryIndex i = 0; i < kMaxSceneryGroupObjects; i++) { const auto* groupEntry = OpenRCT2::ObjectManager::GetObjectEntry(i); if (groupEntry != nullptr) diff --git a/src/openrct2/network/NetworkBase.cpp b/src/openrct2/network/NetworkBase.cpp index 9f940cdc3c..e5bcc9ad08 100644 --- a/src/openrct2/network/NetworkBase.cpp +++ b/src/openrct2/network/NetworkBase.cpp @@ -60,11 +60,11 @@ static int32_t _pickup_peep_old_x = kLocationNull; // General chunk size is 63 KiB, this can not be any larger because the packet size is encoded // with uint16_t and needs some spare room for other data in the packet. -static constexpr uint32_t CHUNK_SIZE = 1024 * 63; +static constexpr uint32_t kChunkSize = 1024 * 63; // If data is sent fast enough it would halt the entire server, process only a maximum amount. // This limit is per connection, the current value was determined by tests with fuzzing. -static constexpr uint32_t MaxPacketsPerUpdate = 100; +static constexpr uint32_t kMaxPacketsPerUpdate = 100; # include "../Cheats.h" # include "../ParkImporter.h" @@ -1381,7 +1381,7 @@ void NetworkBase::ServerSendScripts(NetworkConnection& connection) uint32_t dataOffset = 0; while (dataOffset < pluginData.GetLength()) { - const uint32_t chunkSize = std::min(pluginData.GetLength() - dataOffset, CHUNK_SIZE); + const uint32_t chunkSize = std::min(pluginData.GetLength() - dataOffset, kChunkSize); NetworkPacket packet(NetworkCommand::ScriptsData); packet << chunkSize; @@ -1475,7 +1475,7 @@ void NetworkBase::ServerSendMap(NetworkConnection* connection) } return; } - size_t chunksize = CHUNK_SIZE; + size_t chunksize = kChunkSize; for (size_t i = 0; i < header.size(); i += chunksize) { size_t datasize = std::min(chunksize, header.size() - i); @@ -1764,7 +1764,7 @@ bool NetworkBase::ProcessConnection(NetworkConnection& connection) // could not read anything from socket break; } - } while (packetStatus == NetworkReadPacket::Success && countProcessed < MaxPacketsPerUpdate); + } while (packetStatus == NetworkReadPacket::Success && countProcessed < kMaxPacketsPerUpdate); if (!connection.ReceivedPacketRecently()) { @@ -2274,7 +2274,7 @@ void NetworkBase::ServerHandleRequestGamestate(NetworkConnection& connection, Ne uint32_t length = static_cast(snapshotMemory.GetLength()); while (bytesSent < length) { - uint32_t dataSize = CHUNK_SIZE; + uint32_t dataSize = kChunkSize; if (bytesSent + dataSize > snapshotMemory.GetLength()) { dataSize = snapshotMemory.GetLength() - bytesSent; diff --git a/src/openrct2/network/NetworkServerAdvertiser.cpp b/src/openrct2/network/NetworkServerAdvertiser.cpp index 0d4c42b60d..f6ae41364d 100644 --- a/src/openrct2/network/NetworkServerAdvertiser.cpp +++ b/src/openrct2/network/NetworkServerAdvertiser.cpp @@ -46,8 +46,8 @@ enum class MasterServerStatus }; # ifndef DISABLE_HTTP -constexpr int32_t MASTER_SERVER_REGISTER_TIME = 120 * 1000; // 2 minutes -constexpr int32_t MASTER_SERVER_HEARTBEAT_TIME = 60 * 1000; // 1 minute +constexpr int32_t kMasterServerRegisterTime = 120 * 1000; // 2 minutes +constexpr int32_t kMasterServerHeartbeatTime = 60 * 1000; // 1 minute # endif class NetworkServerAdvertiser final : public INetworkServerAdvertiser @@ -147,7 +147,7 @@ private: switch (_status) { case ADVERTISE_STATUS::UNREGISTERED: - if (_lastAdvertiseTime == 0 || Platform::GetTicks() > _lastAdvertiseTime + MASTER_SERVER_REGISTER_TIME) + if (_lastAdvertiseTime == 0 || Platform::GetTicks() > _lastAdvertiseTime + kMasterServerRegisterTime) { if (_lastAdvertiseTime == 0) { @@ -157,7 +157,7 @@ private: } break; case ADVERTISE_STATUS::REGISTERED: - if (Platform::GetTicks() > _lastHeartbeatTime + MASTER_SERVER_HEARTBEAT_TIME) + if (Platform::GetTicks() > _lastHeartbeatTime + kMasterServerHeartbeatTime) { SendHeartbeat(); } diff --git a/src/openrct2/network/NetworkUser.cpp b/src/openrct2/network/NetworkUser.cpp index 36065bb761..c55a8e734b 100644 --- a/src/openrct2/network/NetworkUser.cpp +++ b/src/openrct2/network/NetworkUser.cpp @@ -23,7 +23,7 @@ using namespace OpenRCT2; -constexpr const utf8* USER_STORE_FILENAME = "users.json"; +constexpr const utf8* kUserStoreFilename = "users.json"; std::unique_ptr NetworkUser::FromJson(const json_t& jsonData) { @@ -212,7 +212,7 @@ NetworkUser* NetworkUserManager::GetOrAddUser(const std::string& hash) u8string NetworkUserManager::GetStorePath() { auto env = OpenRCT2::GetContext()->GetPlatformEnvironment(); - return Path::Combine(env->GetDirectoryPath(OpenRCT2::DIRBASE::USER), USER_STORE_FILENAME); + return Path::Combine(env->GetDirectoryPath(OpenRCT2::DIRBASE::USER), kUserStoreFilename); } #endif diff --git a/src/openrct2/network/Socket.cpp b/src/openrct2/network/Socket.cpp index 68b3d05027..56a1f7db1b 100644 --- a/src/openrct2/network/Socket.cpp +++ b/src/openrct2/network/Socket.cpp @@ -73,7 +73,7 @@ # include "Socket.h" -constexpr auto CONNECT_TIMEOUT = std::chrono::milliseconds(3000); +constexpr auto kConnectTimeout = std::chrono::milliseconds(3000); // RAII WSA initialisation needed for Windows # ifdef _WIN32 @@ -492,7 +492,7 @@ public: return; } } - } while ((std::chrono::system_clock::now() - connectStartTime) < CONNECT_TIMEOUT); + } while ((std::chrono::system_clock::now() - connectStartTime) < kConnectTimeout); // Connection request timed out throw SocketException("Connection timed out."); diff --git a/src/openrct2/object/MusicObject.cpp b/src/openrct2/object/MusicObject.cpp index b5cc02b070..7dcdd63119 100644 --- a/src/openrct2/object/MusicObject.cpp +++ b/src/openrct2/object/MusicObject.cpp @@ -28,7 +28,7 @@ using namespace OpenRCT2; using namespace OpenRCT2::Audio; -constexpr size_t DEFAULT_BYTES_PER_TICK = 1378; +constexpr size_t kDefaultBytesPerTick = 1378; void MusicObject::Load() { @@ -62,13 +62,13 @@ void MusicObject::Load() } else { - track.BytesPerTick = DEFAULT_BYTES_PER_TICK; + track.BytesPerTick = kDefaultBytesPerTick; track.Size = track.Asset.GetSize(); } } else { - track.BytesPerTick = DEFAULT_BYTES_PER_TICK; + track.BytesPerTick = kDefaultBytesPerTick; track.Size = track.Asset.GetSize(); } } diff --git a/src/openrct2/object/Object.cpp b/src/openrct2/object/Object.cpp index fbed23349a..f379edc113 100644 --- a/src/openrct2/object/Object.cpp +++ b/src/openrct2/object/Object.cpp @@ -173,11 +173,11 @@ ObjectEntryDescriptor Object::GetScgPathXHeader() const return ObjectEntryDescriptor("rct2.scenery_group.scgpathx"); } -RCTObjectEntry Object::CreateHeader(const char name[DAT_NAME_LENGTH + 1], uint32_t flags, uint32_t checksum) +RCTObjectEntry Object::CreateHeader(const char name[kDatNameLength + 1], uint32_t flags, uint32_t checksum) { RCTObjectEntry header = {}; header.flags = flags; - std::copy_n(name, DAT_NAME_LENGTH, header.name); + std::copy_n(name, kDatNameLength, header.name); header.checksum = checksum; return header; } diff --git a/src/openrct2/object/ObjectFactory.cpp b/src/openrct2/object/ObjectFactory.cpp index 6d82195985..11c052869b 100644 --- a/src/openrct2/object/ObjectFactory.cpp +++ b/src/openrct2/object/ObjectFactory.cpp @@ -272,7 +272,7 @@ namespace OpenRCT2::ObjectFactory result = CreateObject(entry.GetType()); result->SetDescriptor(ObjectEntryDescriptor(entry)); - utf8 objectName[DAT_NAME_LENGTH + 1] = { 0 }; + utf8 objectName[kDatNameLength + 1] = { 0 }; ObjectEntryGetNameFixed(objectName, sizeof(objectName), &entry); LOG_VERBOSE(" entry: { 0x%08X, \"%s\", 0x%08X }", entry.flags, objectName, entry.checksum); @@ -307,7 +307,7 @@ namespace OpenRCT2::ObjectFactory { result->SetDescriptor(ObjectEntryDescriptor(*entry)); - utf8 objectName[DAT_NAME_LENGTH + 1]; + utf8 objectName[kDatNameLength + 1]; ObjectEntryGetNameFixed(objectName, sizeof(objectName), entry); auto readContext = ReadObjectContext(objectRepository, objectName, !gOpenRCT2NoGraphics, nullptr); diff --git a/src/openrct2/object/ObjectLimits.h b/src/openrct2/object/ObjectLimits.h index 563d54a3c3..1e6ad74796 100644 --- a/src/openrct2/object/ObjectLimits.h +++ b/src/openrct2/object/ObjectLimits.h @@ -13,23 +13,23 @@ // Maximums based on number of values that can be represented in bit group. // Subtract 1 to reserve the NULL entry identifier. -constexpr uint16_t MAX_RIDE_OBJECTS = 2047; -constexpr uint16_t MAX_SMALL_SCENERY_OBJECTS = 2047; -constexpr uint16_t MAX_LARGE_SCENERY_OBJECTS = 2047; -constexpr uint16_t MAX_WALL_SCENERY_OBJECTS = 2047; -constexpr uint16_t MAX_BANNER_OBJECTS = 255; -constexpr uint16_t MAX_PATH_OBJECTS = 255; -constexpr uint16_t MAX_PATH_ADDITION_OBJECTS = 255; -constexpr uint16_t MAX_SCENERY_GROUP_OBJECTS = 255; -constexpr uint16_t MAX_PARK_ENTRANCE_OBJECTS = 4; -constexpr uint16_t MAX_WATER_OBJECTS = 1; -constexpr uint16_t MAX_SCENARIO_TEXT_OBJECTS = 0; -constexpr uint16_t MAX_TERRAIN_SURFACE_OBJECTS = 255; -constexpr uint16_t MAX_TERRAIN_EDGE_OBJECTS = 255; -constexpr uint16_t MAX_STATION_OBJECTS = 255; -constexpr uint16_t MAX_MUSIC_OBJECTS = 255; -constexpr uint16_t MAX_FOOTPATH_SURFACE_OBJECTS = 255; -constexpr uint16_t MAX_FOOTPATH_RAILINGS_OBJECTS = 255; -constexpr uint16_t MAX_AUDIO_OBJECTS = 255; +constexpr uint16_t kMaxRideObjects = 2047; +constexpr uint16_t kMaxSmallSceneryObjects = 2047; +constexpr uint16_t kMaxLargeSceneryObjects = 2047; +constexpr uint16_t kMaxWallSceneryObjects = 2047; +constexpr uint16_t kMaxBannerObjects = 255; +constexpr uint16_t kMaxPathObjects = 255; +constexpr uint16_t kMaxPathAdditionObjects = 255; +constexpr uint16_t kMaxSceneryGroupObjects = 255; +constexpr uint16_t kMaxParkEntranceObjects = 4; +constexpr uint16_t kMaxWaterObjects = 1; +constexpr uint16_t kMaxScenarioTextObjects = 0; +constexpr uint16_t kMaxTerrainSurfaceObjects = 255; +constexpr uint16_t kMaxTerrainEdgeObjects = 255; +constexpr uint16_t kMaxStationObjects = 255; +constexpr uint16_t kMaxMusicObjects = 255; +constexpr uint16_t kMaxFootpathSurfaceObjects = 255; +constexpr uint16_t kMaxFootpathRailingsObjects = 255; +constexpr uint16_t kMaxAudioObjects = 255; -constexpr uint8_t DAT_NAME_LENGTH = 8; +constexpr uint8_t kDatNameLength = 8; diff --git a/src/openrct2/object/ObjectList.cpp b/src/openrct2/object/ObjectList.cpp index a00b69a829..ab19fa80a1 100644 --- a/src/openrct2/object/ObjectList.cpp +++ b/src/openrct2/object/ObjectList.cpp @@ -23,24 +23,20 @@ // 0x0098DA00 static constexpr std::array kObjectEntryGroupCounts = { - MAX_RIDE_OBJECTS, // rides - MAX_SMALL_SCENERY_OBJECTS, // small scenery - MAX_LARGE_SCENERY_OBJECTS, // large scenery - MAX_WALL_SCENERY_OBJECTS, // walls - MAX_BANNER_OBJECTS, // banners - MAX_PATH_OBJECTS, // paths - MAX_PATH_ADDITION_OBJECTS, // path additions - MAX_SCENERY_GROUP_OBJECTS, // scenery sets - MAX_PARK_ENTRANCE_OBJECTS, // park entrance - MAX_WATER_OBJECTS, // water - MAX_SCENARIO_TEXT_OBJECTS, // scenario text - MAX_TERRAIN_SURFACE_OBJECTS, - MAX_TERRAIN_EDGE_OBJECTS, - MAX_STATION_OBJECTS, - MAX_MUSIC_OBJECTS, - MAX_FOOTPATH_SURFACE_OBJECTS, - MAX_FOOTPATH_RAILINGS_OBJECTS, - MAX_AUDIO_OBJECTS, + kMaxRideObjects, // rides + kMaxSmallSceneryObjects, // small scenery + kMaxLargeSceneryObjects, // large scenery + kMaxWallSceneryObjects, // walls + kMaxBannerObjects, // banners + kMaxPathObjects, // paths + kMaxPathAdditionObjects, // path additions + kMaxSceneryGroupObjects, // scenery sets + kMaxParkEntranceObjects, // park entrance + kMaxWaterObjects, // water + kMaxScenarioTextObjects, // scenario text + kMaxTerrainSurfaceObjects, kMaxTerrainEdgeObjects, kMaxStationObjects, + kMaxMusicObjects, kMaxFootpathSurfaceObjects, kMaxFootpathRailingsObjects, + kMaxAudioObjects, }; static_assert(std::size(kObjectEntryGroupCounts) == EnumValue(ObjectType::Count)); @@ -220,7 +216,7 @@ void ObjectGetTypeEntryIndex(size_t index, ObjectType* outObjectType, ObjectEntr void ObjectEntryGetNameFixed(utf8* buffer, size_t bufferSize, const RCTObjectEntry* entry) { - bufferSize = std::min(static_cast(DAT_NAME_LENGTH) + 1, bufferSize); + bufferSize = std::min(static_cast(kDatNameLength) + 1, bufferSize); std::memcpy(buffer, entry->name, bufferSize - 1); buffer[bufferSize - 1] = 0; } diff --git a/src/openrct2/object/ObjectManager.cpp b/src/openrct2/object/ObjectManager.cpp index 5134595c6f..7c7e836be0 100644 --- a/src/openrct2/object/ObjectManager.cpp +++ b/src/openrct2/object/ObjectManager.cpp @@ -763,8 +763,8 @@ private: void ReportObjectLoadProblem(const RCTObjectEntry* entry) { - utf8 objName[DAT_NAME_LENGTH + 1] = { 0 }; - std::copy_n(entry->name, DAT_NAME_LENGTH, objName); + utf8 objName[kDatNameLength + 1] = { 0 }; + std::copy_n(entry->name, kDatNameLength, objName); Console::Error::WriteLine("[%s] Object could not be loaded.", objName); } }; diff --git a/src/openrct2/object/SceneryGroupObject.cpp b/src/openrct2/object/SceneryGroupObject.cpp index cbacac0931..8a3c96fec5 100644 --- a/src/openrct2/object/SceneryGroupObject.cpp +++ b/src/openrct2/object/SceneryGroupObject.cpp @@ -33,8 +33,7 @@ using namespace OpenRCT2; static constexpr uint8_t DatEntryPrefixLength = 5; static constexpr uint8_t DatEntryFlagsLength = 8; static constexpr uint8_t DatEntrySeparatorLength = 1; -static constexpr uint8_t DatEntryLength = DatEntryPrefixLength + DatEntryFlagsLength + DatEntrySeparatorLength - + DAT_NAME_LENGTH; +static constexpr uint8_t DatEntryLength = DatEntryPrefixLength + DatEntryFlagsLength + DatEntrySeparatorLength + kDatNameLength; static constexpr uint8_t DatEntryFlagsStart = DatEntryPrefixLength; static constexpr uint8_t DatEntryNameStart = DatEntryPrefixLength + DatEntryFlagsLength + DatEntrySeparatorLength; @@ -221,7 +220,7 @@ std::vector SceneryGroupObject::ReadJsonEntries(IReadObje { RCTObjectEntry entry = {}; entry.flags = std::stoul(entryName.substr(DatEntryFlagsStart, DatEntryFlagsLength), nullptr, 16); - std::memcpy(entry.name, entryName.c_str() + DatEntryNameStart, DAT_NAME_LENGTH); + std::memcpy(entry.name, entryName.c_str() + DatEntryNameStart, kDatNameLength); entry.checksum = 0; entries.emplace_back(entry); } diff --git a/src/openrct2/park/ParkFile.cpp b/src/openrct2/park/ParkFile.cpp index 8edbc2d9bb..3927da8714 100644 --- a/src/openrct2/park/ParkFile.cpp +++ b/src/openrct2/park/ParkFile.cpp @@ -106,9 +106,9 @@ namespace OpenRCT2 private: std::unique_ptr _os; - ObjectEntryIndex _pathToSurfaceMap[MAX_PATH_OBJECTS]; - ObjectEntryIndex _pathToQueueSurfaceMap[MAX_PATH_OBJECTS]; - ObjectEntryIndex _pathToRailingsMap[MAX_PATH_OBJECTS]; + ObjectEntryIndex _pathToSurfaceMap[kMaxPathObjects]; + ObjectEntryIndex _pathToQueueSurfaceMap[kMaxPathObjects]; + ObjectEntryIndex _pathToRailingsMap[kMaxPathObjects]; void ThrowIfIncompatibleVersion() { diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index 274a3629c2..7e3b0fe6e9 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -124,7 +124,7 @@ namespace OpenRCT2::RCT1 ObjectEntryIndex _footpathRailingsTypeToEntryMap[4]{}; // Research - BitSet _researchRideEntryUsed{}; + BitSet _researchRideEntryUsed{}; BitSet _researchRideTypeUsed{}; // Scenario repository - used for determining scenario name @@ -741,9 +741,9 @@ namespace OpenRCT2::RCT1 else { auto entryName = RCT1::GetSceneryGroupObject(sceneryThemeType); - if (_sceneryGroupEntries.GetCount() >= MAX_SCENERY_GROUP_OBJECTS) + if (_sceneryGroupEntries.GetCount() >= kMaxSceneryGroupObjects) { - Console::WriteLine("Warning: More than %d (max scenery groups) in RCT1 park.", MAX_SCENERY_GROUP_OBJECTS); + Console::WriteLine("Warning: More than %d (max scenery groups) in RCT1 park.", kMaxSceneryGroupObjects); std::string entryNameString = std::string(entryName); Console::WriteLine(" [%s] scenery group not added.", entryNameString.c_str()); } diff --git a/src/openrct2/ride/TrackDesign.cpp b/src/openrct2/ride/TrackDesign.cpp index 9cadfd38f7..5eb226295f 100644 --- a/src/openrct2/ride/TrackDesign.cpp +++ b/src/openrct2/ride/TrackDesign.cpp @@ -642,7 +642,7 @@ struct TrackSceneryEntry static ObjectEntryIndex TrackDesignGetDefaultSurfaceIndex(bool isQueue) { - for (ObjectEntryIndex i = 0; i < MAX_FOOTPATH_SURFACE_OBJECTS; i++) + for (ObjectEntryIndex i = 0; i < kMaxFootpathSurfaceObjects; i++) { auto footpathSurfaceObj = GetPathSurfaceEntry(i); if (footpathSurfaceObj != nullptr) @@ -665,7 +665,7 @@ static ObjectEntryIndex TrackDesignGetDefaultSurfaceIndex(bool isQueue) static ObjectEntryIndex TrackDesignGetDefaultRailingIndex() { - for (ObjectEntryIndex i = 0; i < MAX_FOOTPATH_RAILINGS_OBJECTS; i++) + for (ObjectEntryIndex i = 0; i < kMaxFootpathRailingsObjects; i++) { auto footpathRailingsObj = GetPathRailingsEntry(i); if (footpathRailingsObj != nullptr) diff --git a/src/openrct2/scenario/Scenario.cpp b/src/openrct2/scenario/Scenario.cpp index 29bceebcef..c612470228 100644 --- a/src/openrct2/scenario/Scenario.cpp +++ b/src/openrct2/scenario/Scenario.cpp @@ -658,7 +658,7 @@ ObjectiveStatus Objective::CheckParkValueBy() const ObjectiveStatus Objective::Check10RollerCoasters() const { auto rcs = 0; - BitSet type_already_counted; + BitSet type_already_counted; for (const auto& ride : GetRideManager()) { if (ride.status == RideStatus::Open && ride.ratings.excitement >= RIDE_RATING(6, 00) @@ -759,7 +759,7 @@ ObjectiveStatus Objective::CheckMonthlyRideIncome() const */ ObjectiveStatus Objective::Check10RollerCoastersLength() const { - BitSet type_already_counted; + BitSet type_already_counted; auto rcs = 0; for (const auto& ride : GetRideManager()) { diff --git a/src/openrct2/world/Footpath.cpp b/src/openrct2/world/Footpath.cpp index f9cf3a7fe7..c3439d69dd 100644 --- a/src/openrct2/world/Footpath.cpp +++ b/src/openrct2/world/Footpath.cpp @@ -2187,7 +2187,7 @@ void FootpathRemoveEdgesAt(const CoordsXY& footpathPos, TileElement* tileElement static ObjectEntryIndex FootpathGetDefaultSurface(bool queue) { bool showEditorPaths = ((gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) || OpenRCT2::GetGameState().Cheats.SandboxMode); - for (ObjectEntryIndex i = 0; i < MAX_FOOTPATH_SURFACE_OBJECTS; i++) + for (ObjectEntryIndex i = 0; i < kMaxFootpathSurfaceObjects; i++) { auto pathEntry = GetPathSurfaceEntry(i); if (pathEntry != nullptr) @@ -2225,7 +2225,7 @@ static bool FootpathIsSurfaceEntryOkay(ObjectEntryIndex index, bool queue) static ObjectEntryIndex FootpathGetDefaultRailings() { - for (ObjectEntryIndex i = 0; i < MAX_FOOTPATH_RAILINGS_OBJECTS; i++) + for (ObjectEntryIndex i = 0; i < kMaxFootpathRailingsObjects; i++) { const auto* railingEntry = GetPathRailingsEntry(i); if (railingEntry != nullptr) @@ -2251,7 +2251,7 @@ static bool FootpathIsLegacyPathEntryOkay(ObjectEntryIndex index) static ObjectEntryIndex FootpathGetDefaultLegacyPath() { - for (ObjectEntryIndex i = 0; i < MAX_PATH_OBJECTS; i++) + for (ObjectEntryIndex i = 0; i < kMaxPathObjects; i++) { if (FootpathIsLegacyPathEntryOkay(i)) { diff --git a/src/openrct2/world/Scenery.cpp b/src/openrct2/world/Scenery.cpp index d457cfcf97..f9e5c02c5f 100644 --- a/src/openrct2/world/Scenery.cpp +++ b/src/openrct2/world/Scenery.cpp @@ -335,15 +335,15 @@ static size_t GetMaxObjectsForSceneryType(const uint8_t sceneryType) switch (sceneryType) { case SCENERY_TYPE_SMALL: - return MAX_SMALL_SCENERY_OBJECTS; + return kMaxSmallSceneryObjects; case SCENERY_TYPE_PATH_ITEM: - return MAX_PATH_ADDITION_OBJECTS; + return kMaxPathAdditionObjects; case SCENERY_TYPE_WALL: - return MAX_WALL_SCENERY_OBJECTS; + return kMaxWallSceneryObjects; case SCENERY_TYPE_LARGE: - return MAX_LARGE_SCENERY_OBJECTS; + return kMaxLargeSceneryObjects; case SCENERY_TYPE_BANNER: - return MAX_BANNER_OBJECTS; + return kMaxBannerObjects; default: return 0; } @@ -434,7 +434,7 @@ static MiscScenery GetAllMiscScenery() MiscScenery ret; std::vector referencedBySceneryGroups; std::vector sceneryGroupIds; - for (ObjectEntryIndex i = 0; i < MAX_SCENERY_GROUP_OBJECTS; i++) + for (ObjectEntryIndex i = 0; i < kMaxSceneryGroupObjects; i++) { const auto* sgEntry = OpenRCT2::ObjectManager::GetObjectEntry(i); if (sgEntry != nullptr)