Merge pull request #9437 from Gymnasiast/nog-eens-research

Move research to vectors
OpenRCT2 · Aug 24, 2019 · e11f2d9 · e11f2d9
2 parents 7270a86 + ad96aa5
commit e11f2d9
Show file tree

Hide file tree

Showing 11 changed files with 322 additions and 416 deletions.
diff --git a/src/openrct2-ui/windows/EditorInventionsList.cpp b/src/openrct2-ui/windows/EditorInventionsList.cpp
diff --git a/src/openrct2/EditorObjectSelectionSession.cpp b/src/openrct2/EditorObjectSelectionSession.cpp
@@ -292,7 +292,7 @@ static void remove_selected_objects_from_research(const rct_object_entry* instal
 
         for (auto rideType : rideEntry->ride_type)
         {
-            rct_research_item tmp = {};
+            ResearchItem tmp = {};
             tmp.type = RESEARCH_ENTRY_TYPE_RIDE;
             tmp.entryIndex = entry_index;
             tmp.baseRideType = rideType;
@@ -301,7 +301,7 @@ static void remove_selected_objects_from_research(const rct_object_entry* instal
     }
     else if (entry_type == OBJECT_TYPE_SCENERY_GROUP)
     {
-        rct_research_item tmp = {};
+        ResearchItem tmp = {};
         tmp.type = RESEARCH_ENTRY_TYPE_SCENERY;
         tmp.entryIndex = entry_index;
         research_remove(&tmp);

diff --git a/src/openrct2/interface/Window_internal.h b/src/openrct2/interface/Window_internal.h
@@ -14,7 +14,7 @@
 #include <list>
 #include <memory>
 
-struct rct_research_item;
+struct ResearchItem;
 struct rct_object_entry;
 
 /**
@@ -79,7 +79,7 @@ struct rct_window
     { // 0x494
         uint32_t highlighted_item;
         uint16_t ride_colour;
-        rct_research_item* research_item;
+        ResearchItem* research_item;
         rct_object_entry* object_entry;
         const scenario_index_entry* highlighted_scenario;
         struct