mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-26 08:14:38 +01:00
Code Issues Releases Wiki Activity

Move kObjectEntryGroupCounts to ObjectList.cpp

Browse Source
This commit is contained in:
Aaron van Geffen
2024-03-27 20:13:10 +01:00
parent d645906003
commit e898e9211d
15 changed files with 48 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/openrct2/object/ObjectList.cpp
View File

@@ -14,6 +14,7 @@
#include "../object/Object.h"
#include "../util/SawyerCoding.h"
#include "../util/Util.h"
#include "ObjectLimits.h"
#include "ObjectManager.h"
#include "ObjectRepository.h"
@@ -21,8 +22,8 @@
#include <array>
#include <cstring>
// 98DA00
int32_t object_entry_group_counts[] = {
// 0x0098DA00
static constexpr std::array<int32_t, EnumValue(ObjectType::Count)> kObjectEntryGroupCounts = {
MAX_RIDE_OBJECTS, // rides
MAX_SMALL_SCENERY_OBJECTS, // small scenery
MAX_LARGE_SCENERY_OBJECTS, // large scenery
@@ -42,7 +43,20 @@ int32_t object_entry_group_counts[] = {
MAX_FOOTPATH_RAILINGS_OBJECTS,
MAX_AUDIO_OBJECTS,
};
static_assert(std::size(object_entry_group_counts) == EnumValue(ObjectType::Count));
static_assert(std::size(kObjectEntryGroupCounts) == EnumValue(ObjectType::Count));
size_t getObjectEntryGroupCount(ObjectType objectType)
{
return kObjectEntryGroupCounts[EnumValue(objectType)];
}
size_t getObjectTypeLimit(ObjectType type)
{
auto index = EnumValue(type);
if (index >= EnumValue(ObjectType::Count))
return 0;
return static_cast<size_t>(kObjectEntryGroupCounts[index]);
}
ObjectList::const_iterator::const_iterator(const ObjectList* parent, bool end)
{
@@ -186,7 +200,7 @@ void ObjectCreateIdentifierName(char* string_buffer, size_t size, const RCTObjec
void ObjectGetTypeEntryIndex(size_t index, ObjectType* outObjectType, ObjectEntryIndex* outEntryIndex)
{
uint8_t objectType = EnumValue(ObjectType::Ride);
for (size_t groupCount : object_entry_group_counts)
for (size_t groupCount : kObjectEntryGroupCounts)
{
if (index >= groupCount)
{