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

Fix import of S4 and S6

Browse Source
This commit is contained in:
Ted John
2018-05-21 19:06:21 +01:00
parent 96a0a22cd1
commit 6af0cb2b88
8 changed files with 33 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -135,7 +135,7 @@ public:
{
// Find all the required objects
bool missingObjects;
auto requiredObjects = GetRequiredObjects(entries, &missingObjects);
auto requiredObjects = GetRequiredObjects(entries, count, &missingObjects);
if (missingObjects)
{
return false;
@@ -482,11 +482,11 @@ private:
return invalidEntries;
}
std::vector<const ObjectRepositoryItem *> GetRequiredObjects(const rct_object_entry * entries, bool * missingObjects)
std::vector<const ObjectRepositoryItem *> GetRequiredObjects(const rct_object_entry * entries, size_t count, bool * missingObjects)
{
std::vector<const ObjectRepositoryItem *> requiredObjects;
*missingObjects = false;
for (sint32 i = 0; i < OBJECT_ENTRY_COUNT; i++)
for (sint32 i = 0; i < count; i++)
{
const rct_object_entry * entry = &entries[i];
const ObjectRepositoryItem * ori = nullptr;