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

remove object entry addresses and use constants

Browse Source
This commit is contained in:
Ted John
2016-07-03 15:13:36 +01:00
parent 3bfa747ce4
commit 6f97ec798e
5 changed files with 48 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/object/ObjectRepository.cpp
View File

@@ -561,7 +561,7 @@ IObjectRepository * GetObjectRepository()
return _objectRepository;
}
Object * _loadedObjects[721] = { nullptr };
Object * _loadedObjects[OBJECT_ENTRY_COUNT] = { nullptr };
int GetObjectEntryIndex(uint8 objectType, uint8 entryIndex)
{
@@ -640,7 +640,7 @@ extern "C"
void reset_loaded_objects()
{
for (int i = 0; i < 721; i++)
for (int i = 0; i < OBJECT_ENTRY_COUNT; i++)
{
Object * object = _loadedObjects[i];
if (object != nullptr)
@@ -662,7 +662,7 @@ extern "C"
void * object_repository_find_loaded_object(const rct_object_entry * objectEntry)
{
for (size_t i = 0; i < 721; i++)
for (size_t i = 0; i < OBJECT_ENTRY_COUNT; i++)
{
Object * object = _loadedObjects[i];
if (object != nullptr)
@@ -690,7 +690,7 @@ extern "C"
void object_unload_all()
{
for (int i = 0; i < 721; i++)
for (int i = 0; i < OBJECT_ENTRY_COUNT; i++)
{
Object * object = _loadedObjects[i];
if (object != nullptr)