restores the concept of worldspace for MWWorld::Cell

apps/openmw/mwmechanics/aifollow.cpp

@@ -174,8 +174,8 @@ namespace MWMechanics
                         return true;
                     }
                 }
-                else if (Misc::StringUtils::ciEqual(
+                else if (Misc::StringUtils::ciEqual(mCellId,
-                             mCellId, actor.getCell()->getCell()->getNameId())) // Cell to travel to
+                             actor.getCell()->getCell()->getWorldSpace().getRefIdString())) // Cell to travel to
                 {
                     mRemainingDuration = mDuration;
                     return true;

apps/openmw/mwscript/transformationextensions.cpp

@@ -87,8 +87,7 @@ namespace MWScript
                 float distance;
                 // If the objects are in different worldspaces, return a large value (just like vanilla)
                 if (!to.isInCell() || !from.isInCell()
-                    || !Misc::StringUtils::ciEqual(
+                    || to.getCell()->getCell()->getWorldSpace() != from.getCell()->getCell()->getWorldSpace())
-                        to.getCell()->getCell()->getNameId(), from.getCell()->getCell()->getNameId()))
                     distance = std::numeric_limits<float>::max();
                 else
                 {

apps/openmw/mwworld/cell.cpp

@@ -1,5 +1,6 @@
 #include "cell.hpp"
 
+#include <components/esm3/cellid.hpp>
 #include <components/esm3/loadcell.hpp>
 #include <components/esm4/loadcell.hpp>
 #include <components/misc/algorithm.hpp>
@@ -17,6 +18,7 @@ namespace MWWorld
         , mNameID(cell.mEditorId)
         , mRegion(ESM::RefId()) // Unimplemented for now
         , mId(cell.mId)
+        , mParent(cell.mParent)
         ,mMood{
             .mAmbiantColor = cell.mLighting.ambient,
             .mDirectionalColor = cell.mLighting.directional,
@@ -38,6 +40,7 @@ namespace MWWorld
         , mNameID(cell.mName)
         , mRegion(cell.mRegion)
         , mId(cell.mId)
+        , mParent(ESM::RefId::stringRefId(ESM::CellId::sDefaultWorldspace))
         , mMood{
             .mAmbiantColor = cell.mAmbi.mAmbient,
             .mDirectionalColor = cell.mAmbi.mSunlight,
@@ -56,4 +59,11 @@ namespace MWWorld
                           },
             *this);
     }
+    ESM::RefId Cell::getWorldSpace() const
+    {
+        if (isExterior())
+            return mParent;
+        else
+            return mId;
+    }
 }

apps/openmw/mwworld/cell.hpp

@@ -49,6 +49,7 @@ namespace MWWorld
         const MoodData& getMood() const { return mMood; }
         float getWaterHeight() const { return mWaterHeight; }
         const ESM::RefId& getId() const { return mId; }
+        ESM::RefId getWorldSpace() const;
 
     private:
         bool mIsExterior;
@@ -61,6 +62,7 @@ namespace MWWorld
         std::string mNameID; // The name that will be used by the script and console commands
         ESM::RefId mRegion;
         ESM::RefId mId;
+        ESM::RefId mParent;
         MoodData mMood;
 
         float mWaterHeight;

apps/openmw/mwworld/scene.cpp

@@ -552,9 +552,11 @@ namespace MWWorld
                 unloadCell(cell, navigatorUpdateGuard.get());
         }
 
-        mNavigator.setWorldspace(
+        mNavigator.setWorldspace(Misc::StringUtils::lowerCase(mWorld.getWorldModel()
-            Misc::StringUtils::lowerCase(
+                                                                  .getExterior(playerCellX, playerCellY)
-                mWorld.getWorldModel().getExterior(playerCellX, playerCellY)->getCell()->getNameId()),
+                                                                  ->getCell()
+                                                                  ->getWorldSpace()
+                                                                  .getRefIdString()),
             navigatorUpdateGuard.get());
         mNavigator.updateBounds(pos, navigatorUpdateGuard.get());
 
@@ -675,8 +677,8 @@ namespace MWWorld
                 "Testing exterior cells (" + std::to_string(i) + "/" + std::to_string(cells.getExtSize()) + ")...");
 
             CellStore* cell = mWorld.getWorldModel().getExterior(it->mData.mX, it->mData.mY);
-            mNavigator.setWorldspace(
+            mNavigator.setWorldspace(Misc::StringUtils::lowerCase(cell->getCell()->getWorldSpace().getRefIdString()),
-                Misc::StringUtils::lowerCase(cell->getCell()->getNameId()), navigatorUpdateGuard.get());
+                navigatorUpdateGuard.get());
             const osg::Vec3f position
                 = osg::Vec3f(it->mData.mX + 0.5f, it->mData.mY + 0.5f, 0) * Constants::CellSizeInUnits;
             mNavigator.updateBounds(position, navigatorUpdateGuard.get());
@@ -733,8 +735,8 @@ namespace MWWorld
                 "Testing interior cells (" + std::to_string(i) + "/" + std::to_string(cells.getIntSize()) + ")...");
 
             CellStore* cell = mWorld.getWorldModel().getInterior(it->mName);
-            mNavigator.setWorldspace(
+            mNavigator.setWorldspace(Misc::StringUtils::lowerCase(cell->getCell()->getWorldSpace().getRefIdString()),
-                Misc::StringUtils::lowerCase(cell->getCell()->getNameId()), navigatorUpdateGuard.get());
+                navigatorUpdateGuard.get());
             ESM::Position position;
             mWorld.findInteriorPosition(it->mName, position);
             mNavigator.updateBounds(position.asVec3(), navigatorUpdateGuard.get());
@@ -750,7 +752,7 @@ namespace MWWorld
             {
                 assert(!(*iter)->getCell()->isExterior());
 
-                if (it->mName == (*iter)->getCell()->getNameId())
+                if (it->mName == (*iter)->getCell()->getWorldSpace().getRefIdString())
                 {
                     unloadCell(*iter, navigatorUpdateGuard.get());
                     break;
@@ -889,8 +891,8 @@ namespace MWWorld
 
         loadingListener->setProgressRange(cell->count());
 
-        mNavigator.setWorldspace(
+        mNavigator.setWorldspace(Misc::StringUtils::lowerCase(cell->getCell()->getWorldSpace().getRefIdString()),
-            Misc::StringUtils::lowerCase(cell->getCell()->getNameId()), navigatorUpdateGuard.get());
+            navigatorUpdateGuard.get());
         mNavigator.updateBounds(position.asVec3(), navigatorUpdateGuard.get());
 
         // Load cell.

components/esm4/loadcell.cpp

@@ -53,7 +53,7 @@ void ESM4::Cell::load(ESM4::Reader& reader)
     reader.adjustFormId(mFormId);
     mId = ESM::RefId::formIdRefId(mFormId);
     mFlags = reader.hdr().record.flags;
-    mParent = reader.currWorld();
+    mParent = ESM::RefId::formIdRefId(reader.currWorld());
 
     reader.clearCellGrid(); // clear until XCLC FIXME: somehow do this automatically?
 

components/esm4/loadcell.hpp

@@ -68,7 +68,7 @@ namespace ESM4
         ESM::RefId mId;
         std::uint32_t mFlags; // from the header, see enum type RecordFlag for details
 
-        FormId mParent; // world formId (for grouping cells), from the loading sequence
+        ESM::RefId mParent; // world formId (for grouping cells), from the loading sequence
 
         std::string mEditorId;
         std::string mFullName;