mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix #17466: New object types not packed in save files (#17467)

This commit is contained in:
Ted John 2022-06-28 19:59:09 +01:00 committed by GitHub
parent c823bf5f7e
commit 854655af55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -252,7 +252,7 @@ public:
for (size_t i = 0; i < numObjects; i++)
{
const ObjectRepositoryItem* item = &_objectRepository.GetObjects()[i];
if (item->LoadedObject != nullptr && IsObjectCustom(item) && item->LoadedObject->GetLegacyData() != nullptr)
if (item->LoadedObject != nullptr && IsObjectCustom(item))
{
objects.push_back(item);
}

8
src/openrct2/object/ObjectRepository.cpp
View File

@ -640,14 +640,6 @@ std::unique_ptr<IObjectRepository> CreateObjectRepository(const std::shared_ptr<
bool IsObjectCustom(const ObjectRepositoryItem* object)
{
Guard::ArgumentNotNull(object);
// Do not count our new object types as custom yet, otherwise the game
// will try to pack them into saved games.
if (object->Type > ObjectType::ScenarioText)
{
return false;
}
switch (object->GetFirstSourceGame())
{
case ObjectSourceGame::RCT1: