Attempt at showing secondary source game

src/openrct2-ui/windows/EditorObjectSelection.cpp

@@ -222,7 +222,7 @@ static void window_editor_object_selection_manage_tracks();
 static void editor_load_selected_objects();
 static bool filter_selected(uint8_t objectFlags);
 static bool filter_string(const ObjectRepositoryItem* item);
-static bool filter_source(const ObjectRepositoryItem* item);
+static bool filter_source(const ObjectRepositoryItem* item, bool selected);
 static bool filter_chunks(const ObjectRepositoryItem* item);
 static void filter_update_counts();
 
@@ -301,7 +301,8 @@ static void visible_list_refresh(rct_window* w)
         uint8_t selectionFlags = _objectSelectionFlags[i];
         const ObjectRepositoryItem* item = &items[i];
         uint8_t objectType = item->ObjectEntry.flags & 0x0F;
-        if (objectType == get_selected_object_type(w) && !(selectionFlags & OBJECT_SELECTION_FLAG_6) && filter_source(item)
+        if (objectType == get_selected_object_type(w) && !(selectionFlags & OBJECT_SELECTION_FLAG_6)
+            && filter_source(item, (selectionFlags & OBJECT_SELECTION_FLAG_SELECTED))
             && filter_string(item) && filter_chunks(item) && filter_selected(selectionFlags))
         {
             rct_object_filters* filter = new rct_object_filters;
@@ -1408,19 +1409,60 @@ static bool filter_string(const ObjectRepositoryItem* item)
     return inName || inRideType || inPath;
 }
 
-static bool filter_source(const ObjectRepositoryItem* item)
+static bool sources_match(uint8_t source)
+{
+    // clang-format off
+    return (_FILTER_RCT1 && source == OBJECT_SOURCE_RCT1) ||
+           (_FILTER_AA && source == OBJECT_SOURCE_ADDED_ATTRACTIONS) ||
+           (_FILTER_LL && source == OBJECT_SOURCE_LOOPY_LANDSCAPES) ||
+           (_FILTER_RCT2 && source == OBJECT_SOURCE_RCT2) ||
+           (_FILTER_WW && source == OBJECT_SOURCE_WACKY_WORLDS) ||
+           (_FILTER_TT && source == OBJECT_SOURCE_TIME_TWISTER) ||
+           (_FILTER_OO && source == OBJECT_SOURCE_OPENRCT2_OFFICIAL) ||
+           (_FILTER_CUSTOM &&
+            source != OBJECT_SOURCE_RCT1 &&
+            source != OBJECT_SOURCE_ADDED_ATTRACTIONS &&
+            source != OBJECT_SOURCE_LOOPY_LANDSCAPES &&
+            source != OBJECT_SOURCE_RCT2 &&
+            source != OBJECT_SOURCE_WACKY_WORLDS &&
+            source != OBJECT_SOURCE_TIME_TWISTER &&
+            source != OBJECT_SOURCE_OPENRCT2_OFFICIAL);
+    // clang-format on
+}
+
+static bool filter_source(const ObjectRepositoryItem* item, bool selected)
 {
     if (_FILTER_ALL)
         return true;
 
     uint8_t source = object_entry_get_source_game(&item->ObjectEntry);
-    return (_FILTER_RCT1 && source == OBJECT_SOURCE_RCT1) || (_FILTER_AA && source == OBJECT_SOURCE_ADDED_ATTRACTIONS)
+    uint8_t secondSource = OBJECT_SOURCE_CUSTOM;
-        || (_FILTER_LL && source == OBJECT_SOURCE_LOOPY_LANDSCAPES) || (_FILTER_RCT2 && source == OBJECT_SOURCE_RCT2)
+
-        || (_FILTER_WW && source == OBJECT_SOURCE_WACKY_WORLDS) || (_FILTER_TT && source == OBJECT_SOURCE_TIME_TWISTER)
+    _loadedObject = item->LoadedObject;
-        || (_FILTER_OO && source == OBJECT_SOURCE_OPENRCT2_OFFICIAL)
+    if (_loadedObject == nullptr)
-        || (_FILTER_CUSTOM && source != OBJECT_SOURCE_RCT1 && source != OBJECT_SOURCE_ADDED_ATTRACTIONS
+    {
-            && source != OBJECT_SOURCE_LOOPY_LANDSCAPES && source != OBJECT_SOURCE_RCT2 && source != OBJECT_SOURCE_WACKY_WORLDS
+        _loadedObject = object_manager_get_loaded_object(&item->ObjectEntry);
-            && source != OBJECT_SOURCE_TIME_TWISTER && source != OBJECT_SOURCE_OPENRCT2_OFFICIAL);
+    }
+    if (_loadedObject == nullptr)
+    {
+        _loadedObject = object_manager_load_object(&item->ObjectEntry);
+    }
+    if (_loadedObject != nullptr)
+    {
+        secondSource = ((Object*)_loadedObject)->GetSecondSourceGame();
+    }
+
+    if (!selected && _loadedObject != nullptr)
+    {
+        uint8_t objectType = object_entry_get_type(&item->ObjectEntry);
+
+        if (objectType != OBJECT_TYPE_PARK_ENTRANCE && objectType != OBJECT_TYPE_SCENARIO_TEXT && objectType != OBJECT_TYPE_WATER && objectType != OBJECT_TYPE_SCENERY_GROUP)
+        {
+            ((Object*)_loadedObject)->Unload();
+        }
+    }
+
+    return sources_match(source) || (secondSource != OBJECT_SOURCE_CUSTOM && sources_match(secondSource));
 }
 
 static bool filter_chunks(const ObjectRepositoryItem* item)
@@ -1458,10 +1500,10 @@ static void filter_update_counts()
 
         size_t numObjects = object_repository_get_items_count();
         const ObjectRepositoryItem* items = object_repository_get_items();
-        for (size_t i = 0; i < numObjects; i++)
+        for (size_t i = 0; i < numObjects; i++) {
-        {
+            const ObjectRepositoryItem * item = &items[i];
-            const ObjectRepositoryItem* item = &items[i];
+            if (filter_source(item, (selectionFlags[i] & OBJECT_SELECTION_FLAG_SELECTED)) && filter_string(item)
-            if (filter_source(item) && filter_string(item) && filter_chunks(item) && filter_selected(selectionFlags[i]))
+                && filter_chunks(item) && filter_selected(selectionFlags[i]))
             {
                 uint8_t objectType = item->ObjectEntry.flags & 0xF;
                 _filter_object_counts[objectType]++;

src/openrct2/object/Object.cpp

@@ -24,6 +24,7 @@ Object::Object(const rct_object_entry& entry)
     char name[DAT_NAME_LENGTH + 1] = { 0 };
     std::copy_n(entry.name, DAT_NAME_LENGTH, name);
     _identifier = String::Duplicate(name);
+    _secondSourceGame = OBJECT_SOURCE_CUSTOM;
 
     if (IsOpenRCT2OfficialObject())
     {
@@ -90,6 +91,16 @@ void Object::SetSourceGame(const uint8_t sourceGame)
     _objectEntry.flags |= (sourceGame << 4);*/
 }
 
+const uint8_t Object::GetSecondSourceGame()
+{
+    return _secondSourceGame;
+}
+
+void Object::SetSecondSourceGame(const uint8_t sourceGame)
+{
+    _secondSourceGame = sourceGame;
+}
+
 bool Object::IsOpenRCT2OfficialObject()
 {
     static const char _openRCT2OfficialObjects[][9] = {

src/openrct2/object/Object.h

@@ -157,6 +157,7 @@ private:
     rct_object_entry _objectEntry{};
     StringTable _stringTable;
     ImageTable _imageTable;
+    uint8_t _secondSourceGame;
 
 protected:
     StringTable& GetStringTable()
@@ -215,6 +216,8 @@ public:
     virtual void SetRepositoryItem(ObjectRepositoryItem* /*item*/) const
     {
     }
+    const uint8_t GetSecondSourceGame();
+    void SetSecondSourceGame(uint8_t sourceGame);
 
     const ImageTable& GetImageTable() const
     {

src/openrct2/object/ObjectFactory.cpp

@@ -34,6 +34,7 @@
 #include "StexObject.h"
 #include "WallObject.h"
 #include "WaterObject.h"
+#include <unordered_map>
 
 interface IFileDataRetriever
 {
@@ -153,7 +154,30 @@ namespace ObjectFactory
     static Object* CreateObjectFromJson(
         IObjectRepository& objectRepository, const json_t* jRoot, const IFileDataRetriever* fileRetriever);
 
+<<<<<<< HEAD
     static void ReadObjectLegacy(Object* object, IReadObjectContext* context, IStream* stream)
+=======
+    static uint8_t ParseSourceGame(const std::string &s)
+    {
+        static const std::unordered_map<std::string, uint8_t> LookupTable
+        {
+            { "rct1",        OBJECT_SOURCE_RCT1 },
+            { "rct1aa",      OBJECT_SOURCE_ADDED_ATTRACTIONS },
+            { "rct1ll",      OBJECT_SOURCE_LOOPY_LANDSCAPES },
+            { "rct2",        OBJECT_SOURCE_RCT2 },
+            { "rct2ww",      OBJECT_SOURCE_WACKY_WORLDS },
+            { "rct2tt",      OBJECT_SOURCE_TIME_TWISTER },
+            { "official",    OBJECT_SOURCE_OPENRCT2_OFFICIAL },
+            { "custom",      OBJECT_SOURCE_CUSTOM },
+        };
+        auto result = LookupTable.find(s);
+        return (result != LookupTable.end()) ?
+               result->second :
+               OBJECT_SOURCE_CUSTOM;
+    }
+
+    static void ReadObjectLegacy(Object * object, IReadObjectContext * context, IStream * stream)
+>>>>>>> e280f8972... Attempt at showing secondary source game
     {
         try
         {
@@ -388,6 +412,12 @@ namespace ObjectFactory
                 {
                     throw std::runtime_error("Object has errors");
                 }
+                auto sourceGames = json_object_get(jRoot, "sourceGame");
+                if (json_is_array(sourceGames))
+                {
+                    auto secondSourceGame = json_string_value(json_array_get(sourceGames, 1));
+                    result->SetSecondSourceGame(ParseSourceGame(secondSourceGame));
+                }
             }
         }
         return result;

src/openrct2/object/ObjectRepository.cpp

@@ -72,7 +72,7 @@ class ObjectFileIndex final : public FileIndex<ObjectRepositoryItem>
 {
 private:
     static constexpr uint32_t MAGIC_NUMBER = 0x5844494F; // OIDX
-    static constexpr uint16_t VERSION = 17;
+    static constexpr uint16_t VERSION = 18;
     static constexpr auto PATTERN = "*.dat;*.pob;*.json;*.parkobj";
 
     IObjectRepository& _objectRepository;