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

remove a lot of old object code

Browse Source
This commit is contained in:
Ted John
2016-06-26 16:55:46 +01:00
parent 9b90249f5b
commit 50b7e4222f
8 changed files with 53 additions and 685 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/object/ObjectRepository.cpp
View File

@@ -102,6 +102,21 @@ public:
}
}
const ObjectRepositoryItem * FindObject(const utf8 * name) override
{
rct_object_entry entry = { 0 };
utf8 entryName[9] = { ' ' };
String::Set(entryName, sizeof(entryName), name);
Memory::Copy<void>(entry.name, entryName, 8);
auto kvp = _itemMap.find(entry);
if (kvp != _itemMap.end())
{
return &_items[kvp->second];
}
return nullptr;
}
const ObjectRepositoryItem * FindObject(const rct_object_entry * objectEntry) override
{
auto kvp = _itemMap.find(*objectEntry);
@@ -384,6 +399,20 @@ int GetObjectEntryIndex(uint8 objectType, uint8 entryIndex)
extern "C"
{
rct_object_entry * object_list_find(rct_object_entry * entry)
{
IObjectRepository * objRepo = GetObjectRepository();
const ObjectRepositoryItem * item = objRepo->FindObject(entry);
return (rct_object_entry *)&item->ObjectEntry;
}
rct_object_entry * object_list_find_by_name(const char * name)
{
IObjectRepository * objRepo = GetObjectRepository();
const ObjectRepositoryItem * item = objRepo->FindObject(name);
return (rct_object_entry *)&item->ObjectEntry;
}
void object_list_load()
{
IObjectRepository * objRepo = GetObjectRepository();