Merge branch 'interiorvention' into 'master'

Fix exterior check when finding markers

Closes #7330 and #7326

See merge request OpenMW/openmw!2923

apps/openmw/mwgui/console.cpp

@@ -114,13 +114,8 @@ namespace MWGui
                 store->listIdentifier(ids);
                 for (auto id : ids)
                 {
-                    visit(
-                        [&](auto&& variant) {
-                            using T = std::decay_t<decltype(variant)>;
-                            if constexpr (std::is_same_v<T, ESM::StringRefId>)
-                                mNames.push_back(id.getRefIdString());
-                        },
-                        id);
+                    if (id.is<ESM::StringRefId>())
+                        mNames.push_back(id.getRefIdString());
                 }
                 ids.clear();
             }

apps/openmw/mwworld/worldimp.cpp

@@ -3298,7 +3298,7 @@ namespace MWWorld
                     if (!ref.mRef.getTeleport())
                         continue;
 
-                    if (ref.mRef.getDestCell().empty())
+                    if (ref.mRef.getDestCell().is<ESM::ESM3ExteriorCellRefId>())
                     {
                         ESM::Position pos = ref.mRef.getDoorDest();
                         result = pos.asVec3();
@@ -3338,8 +3338,8 @@ namespace MWWorld
         nextCells.insert(ptr.getCell()->getCell()->getId());
         while (!nextCells.empty())
         {
-            currentCells = nextCells;
-            nextCells.clear();
+            currentCells.clear();
+            std::swap(currentCells, nextCells);
             for (const auto& cell : currentCells)
             {
                 MWWorld::CellStore* next = mWorldModel.getCell(cell);
@@ -3359,7 +3359,7 @@ namespace MWWorld
                     if (!ref.mRef.getTeleport())
                         continue;
 
-                    if (ref.mRef.getDestCell().empty())
+                    if (ref.mRef.getDestCell().is<ESM::ESM3ExteriorCellRefId>())
                     {
                         osg::Vec3f worldPos = ref.mRef.getDoorDest().asVec3();
                         return getClosestMarkerFromExteriorPosition(worldPos, id);
@@ -3367,7 +3367,7 @@ namespace MWWorld
                     else
                     {
                         const auto& dest = ref.mRef.getDestCell();
-                        if (!checkedCells.count(dest) && !currentCells.count(dest))
+                        if (!checkedCells.contains(dest) && !currentCells.contains(dest))
                             nextCells.insert(dest);
                     }
                 }

components/esm/refid.hpp

@@ -142,6 +142,12 @@ namespace ESM
             return std::get_if<T>(&mValue);
         }
 
+        template <class T>
+        bool is() const
+        {
+            return std::holds_alternative<T>(mValue);
+        }
+
         friend constexpr bool operator==(const RefId& l, const RefId& r) { return l.mValue == r.mValue; }
 
         bool operator==(std::string_view rhs) const;