From d64be1c092f2e88ef4016395d14866c4a39af54e Mon Sep 17 00:00:00 2001
From: MiroslavR <miroslavr256@gmail.com>
Date: Wed, 10 Sep 2014 02:49:57 +0200
Subject: [PATCH] Use CellId::mWorldspace to find out whether objects are in
 the same worldspace

---
 apps/openmw/mwscript/interpretercontext.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwscript/interpretercontext.cpp b/apps/openmw/mwscript/interpretercontext.cpp
index a433746244..336e9431bc 100644
--- a/apps/openmw/mwscript/interpretercontext.cpp
+++ b/apps/openmw/mwscript/interpretercontext.cpp
@@ -9,6 +9,8 @@
 
 #include <components/compiler/locals.hpp>
 
+#include <components/esm/cellid.hpp>
+
 #include "../mwworld/esmstore.hpp"
 
 #include "../mwbase/environment.hpp"
@@ -435,8 +437,7 @@ namespace MWScript
         const MWWorld::Ptr ref = MWBase::Environment::get().getWorld()->getPtr(name, false);
 
         // If the objects are in different worldspaces, return a large value (just like vanilla)
-        if (ref.getCell()->isExterior() ^ ref2.getCell()->isExterior()
-            || (!ref.getCell()->isExterior() && !ref2.getCell()->isExterior() && ref.getCell() != ref2.getCell()))
+        if (ref.getCell()->getCell()->getCellId().mWorldspace != ref2.getCell()->getCell()->getCellId().mWorldspace)
             return std::numeric_limits<float>().max();
 
         double diff[3];