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

Remove unused functions

Browse Source
This commit is contained in:
ζeh Matt
2021-09-03 14:10:42 +03:00
parent 976c614881
commit a118b16912
2 changed files with 0 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -534,60 +534,6 @@ private:
return entryIndex;
}
rct_object_entry* DuplicateObjectEntry(const rct_object_entry* original)
{
rct_object_entry* duplicate = Memory::Allocate<rct_object_entry>(sizeof(rct_object_entry));
duplicate->checksum = original->checksum;
strncpy(duplicate->name, original->name, 8);
duplicate->flags = original->flags;
return duplicate;
}
std::vector<rct_object_entry> GetInvalidObjects(const rct_object_entry* entries) override
{
std::vector<rct_object_entry> invalidEntries;
invalidEntries.reserve(OBJECT_ENTRY_COUNT);
for (int32_t i = 0; i < OBJECT_ENTRY_COUNT; i++)
{
auto entry = entries[i];
const ObjectRepositoryItem* ori = nullptr;
if (object_entry_is_empty(&entry))
{
entry = {};
continue;
}
ori = _objectRepository.FindObject(&entry);
if (ori == nullptr)
{
if (entry.GetType() != ObjectType::ScenarioText)
{
invalidEntries.push_back(entry);
ReportMissingObject(&entry);
}
else
{
entry = {};
continue;
}
}
else
{
auto* loadedObject = ori->LoadedObject.get();
if (loadedObject == nullptr)
{
auto object = _objectRepository.LoadObject(ori);
if (object == nullptr)
{
invalidEntries.push_back(entry);
ReportObjectLoadProblem(&entry);
}
}
}
}
return invalidEntries;
}
std::vector<const ObjectRepositoryItem*> GetRequiredObjects(const rct_object_entry* entries, size_t count)
{
std::vector<const ObjectRepositoryItem*> requiredObjects;
@@ -787,13 +733,6 @@ std::unique_ptr<IObjectManager> CreateObjectManager(IObjectRepository& objectRep
return std::make_unique<ObjectManager>(objectRepository);
}
Object* object_manager_get_loaded_object_by_index(size_t index)
{
auto& objectManager = OpenRCT2::GetContext()->GetObjectManager();
Object* loadedObject = objectManager.GetLoadedObject(index);
return loadedObject;
}
Object* object_manager_get_loaded_object(const ObjectEntryDescriptor& entry)
{
auto& objectManager = OpenRCT2::GetContext()->GetObjectManager();

1
src/openrct2/object/ObjectManager.h
View File

@@ -45,7 +45,6 @@ struct IObjectManager
[[nodiscard]] std::unique_ptr<IObjectManager> CreateObjectManager(IObjectRepository& objectRepository);
[[nodiscard]] Object* object_manager_get_loaded_object_by_index(size_t index);
[[nodiscard]] Object* object_manager_get_loaded_object(const ObjectEntryDescriptor& entry);
[[nodiscard]] ObjectEntryIndex object_manager_get_loaded_object_entry_index(const Object* loadedObject);
[[nodiscard]] ObjectEntryIndex object_manager_get_loaded_object_entry_index(const ObjectEntryDescriptor& entry);