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

Use types from common.h

Browse Source
This commit is contained in:
Broxzier
2017-01-04 22:17:08 +01:00
parent 3d7cfa2772
commit 60603ae10a
368 changed files with 10839 additions and 10839 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/openrct2/object/ObjectManager.cpp
View File

@@ -186,7 +186,7 @@ public:
{
if (_loadedObjects != nullptr)
{
for (int i = 0; i < OBJECT_ENTRY_COUNT; i++)
for (sint32 i = 0; i < OBJECT_ENTRY_COUNT; i++)
{
UnloadObject(_loadedObjects[i]);
}
@@ -304,7 +304,7 @@ private:
// Build a hash set for quick checking
auto exceptSet = std::unordered_set<Object *>();
for (int i = 0; i < OBJECT_ENTRY_COUNT; i++)
for (sint32 i = 0; i < OBJECT_ENTRY_COUNT; i++)
{
Object * object = newLoadedObjects[i];
if (object != nullptr)
@@ -316,7 +316,7 @@ private:
// Unload objects that are not in the hash set
size_t totalObjectsLoaded = 0;
size_t numObjectsUnloaded = 0;
for (int i = 0; i < OBJECT_ENTRY_COUNT; i++)
for (sint32 i = 0; i < OBJECT_ENTRY_COUNT; i++)
{
Object * object = _loadedObjects[i];
if (object != nullptr)
@@ -335,7 +335,7 @@ private:
void UpdateLegacyLoadedObjectList()
{
for (int i = 0; i < OBJECT_ENTRY_COUNT; i++)
for (sint32 i = 0; i < OBJECT_ENTRY_COUNT; i++)
{
Object * loadedObject = nullptr;
if (_loadedObjects != nullptr)
@@ -427,7 +427,7 @@ private:
{
bool missingObjects = false;
size_t numRequiredObjects = 0;
for (int i = 0; i < OBJECT_ENTRY_COUNT; i++)
for (sint32 i = 0; i < OBJECT_ENTRY_COUNT; i++)
{
const rct_object_entry * entry = &entries[i];
const ObjectRepositoryItem * ori = nullptr;
@@ -455,7 +455,7 @@ private:
{
size_t newObjectsLoaded = 0;
Object * * loadedObjects = Memory::AllocateArray<Object *>(OBJECT_ENTRY_COUNT);
for (int i = 0; i < OBJECT_ENTRY_COUNT; i++)
for (sint32 i = 0; i < OBJECT_ENTRY_COUNT; i++)
{
Object * loadedObject = nullptr;
const ObjectRepositoryItem * ori = requiredObjects[i];
@@ -518,7 +518,7 @@ private:
static sint32 GetIndexFromTypeEntry(uint8 objectType, uint8 entryIndex)
{
int result = 0;
sint32 result = 0;
for (uint8 i = 0; i < objectType; i++)
{
result += object_entry_group_counts[i];