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

Update objects to v1.0.21

Browse Source
This commit is contained in:
Michael Steenbeek
2021-03-12 11:04:04 +01:00
committed by GitHub
parent cffb467a77
commit f0dc28e9fc
16 changed files with 54 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/openrct2/EditorObjectSelectionSession.cpp
View File

@@ -405,15 +405,16 @@ static void ReplaceSelectedWaterPalette(const ObjectRepositoryItem* item)
objectManager.UnloadObjects(oldEntries);
}
const rct_object_entry* newPaletteEntry = &item->ObjectEntry;
const rct_object_entry& newPaletteEntry = item->ObjectEntry;
if (objectManager.GetLoadedObject(newPaletteEntry) != nullptr || objectManager.LoadObject(newPaletteEntry) != nullptr)
if (objectManager.GetLoadedObject(ObjectEntryDescriptor(newPaletteEntry)) != nullptr
|| objectManager.LoadObject(&newPaletteEntry) != nullptr)
{
load_palette();
}
else
{
log_error("Failed to load selected palette %.8s", newPaletteEntry->name);
log_error("Failed to load selected palette %.8s", newPaletteEntry.name);
}
}