diff --git a/src/object/ObjectRepository.cpp b/src/object/ObjectRepository.cpp index 18ae1ce8e5..e89f21dd7c 100644 --- a/src/object/ObjectRepository.cpp +++ b/src/object/ObjectRepository.cpp @@ -711,14 +711,6 @@ extern "C" return (void *)object; } - void * object_repository_get_loaded_object(uint8 objectType, uint8 entryIndex) - { - int index = GetObjectEntryIndex(objectType, entryIndex); - - IObjectManager * objectManager = GetObjectManager(); - return (void *)objectManager->GetLoadedObject(index); - } - void object_repository_unload(size_t itemIndex) { // TODO diff --git a/src/object/ObjectRepository.h b/src/object/ObjectRepository.h index 1ee96967b4..9652f13708 100644 --- a/src/object/ObjectRepository.h +++ b/src/object/ObjectRepository.h @@ -86,7 +86,6 @@ const ObjectRepositoryItem * object_repository_get_items(); const ObjectRepositoryItem * object_repository_find_object_by_entry(const rct_object_entry * entry); const ObjectRepositoryItem * object_repository_find_object_by_name(const char * name); void * object_repository_load_object(const rct_object_entry * objectEntry); -void * object_repository_get_loaded_object(uint8 objectType, uint8 entryIndex); void object_repository_unload(size_t itemIndex); void object_delete(void * object); diff --git a/src/windows/editor_inventions_list.c b/src/windows/editor_inventions_list.c index f15c16a0cb..25fee9c2eb 100644 --- a/src/windows/editor_inventions_list.c +++ b/src/windows/editor_inventions_list.c @@ -23,6 +23,7 @@ #include "../localisation/localisation.h" #include "../management/research.h" #include "../object.h" +#include "../object/ObjectManager.h" #include "../object/ObjectRepository.h" #include "../rct1.h" #include "../sprites.h" @@ -783,9 +784,12 @@ static void window_editor_inventions_list_paint(rct_window *w, rct_drawpixelinfo if (chunk == NULL || chunk == (void*)0xFFFFFFFF) return; + rct_object_entry * entry = &object_entry_groups[objectEntryType].entries[researchItem->entryIndex & 0xFF].entry; + // Draw preview widget = &w->widgets[WIDX_PREVIEW]; - void * object = object_repository_get_loaded_object(objectEntryType, researchItem->entryIndex & 0xFF); + + void * object = object_manager_get_loaded_object(entry); if (object != NULL) { rct_drawpixelinfo clipDPI; x = w->x + widget->left + 1;