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

Prevent use of Context during ~Context

Browse Source
This commit is contained in:
Ted John
2018-04-20 23:17:01 +01:00
parent 529c744276
commit d7e93cec27
3 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,7 +48,7 @@ public:
_loadedObjects.resize(OBJECT_ENTRY_COUNT);
UpdateSceneryGroupIndexes();
reset_type_to_ride_entry_index_map();
ResetTypeToRideEntryIndexMap();
}
~ObjectManager() override
@@ -134,7 +134,7 @@ public:
}
_loadedObjects[slot] = loadedObject;
UpdateSceneryGroupIndexes();
reset_type_to_ride_entry_index_map();
ResetTypeToRideEntryIndexMap();
}
}
}
@@ -165,7 +165,7 @@ public:
{
SetNewLoadedObjectList(std::get<1>(loadedObjects));
UpdateSceneryGroupIndexes();
reset_type_to_ride_entry_index_map();
ResetTypeToRideEntryIndexMap();
log_verbose("%u / %u new objects loaded", numNewLoadedObjects, requiredObjects.size());
return true;
}
@@ -196,7 +196,7 @@ public:
if (numObjectsUnloaded > 0)
{
UpdateSceneryGroupIndexes();
reset_type_to_ride_entry_index_map();
ResetTypeToRideEntryIndexMap();
}
}
@@ -207,7 +207,7 @@ public:
UnloadObject(object);
}
UpdateSceneryGroupIndexes();
reset_type_to_ride_entry_index_map();
ResetTypeToRideEntryIndexMap();
}
void ResetObjects() override
@@ -221,7 +221,7 @@ public:
}
}
UpdateSceneryGroupIndexes();
reset_type_to_ride_entry_index_map();
ResetTypeToRideEntryIndexMap();
}
std::vector<const ObjectRepositoryItem *> GetPackableObjects() override
@@ -546,6 +546,11 @@ private:
return loadedObject;
}
void ResetTypeToRideEntryIndexMap()
{
reset_type_to_ride_entry_index_map(*this);
}
static void ReportMissingObject(const rct_object_entry * entry)
{
utf8 objName[DAT_NAME_LENGTH + 1] = { 0 };