From e32402a0402be2bb36754fe2b718aa384df54726 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Fri, 9 Jan 2015 12:05:16 +0100
Subject: [PATCH] handle moved references on load

---
 apps/opencs/model/world/ref.cpp           | 10 ++++++++++
 apps/opencs/model/world/ref.hpp           |  5 +++++
 apps/opencs/model/world/refcollection.cpp | 14 ++++++++++++--
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/apps/opencs/model/world/ref.cpp b/apps/opencs/model/world/ref.cpp
index f3c1b0b73..63594acc8 100644
--- a/apps/opencs/model/world/ref.cpp
+++ b/apps/opencs/model/world/ref.cpp
@@ -1,8 +1,18 @@
 
 #include "ref.hpp"
 
+#include <cmath>
+
 CSMWorld::CellRef::CellRef()
 {
     mRefNum.mIndex = 0;
     mRefNum.mContentFile = 0;
+}
+
+std::pair<int, int> CSMWorld::CellRef::getCellIndex() const
+{
+    const int cellSize = 8192;
+
+    return std::make_pair (
+        std::floor (mPos.pos[0]/cellSize), std::floor (mPos.pos[1]/cellSize));
 }
\ No newline at end of file
diff --git a/apps/opencs/model/world/ref.hpp b/apps/opencs/model/world/ref.hpp
index 411024691..dae9488f0 100644
--- a/apps/opencs/model/world/ref.hpp
+++ b/apps/opencs/model/world/ref.hpp
@@ -1,6 +1,8 @@
 #ifndef CSM_WOLRD_REF_H
 #define CSM_WOLRD_REF_H
 
+#include <utility>
+
 #include <components/esm/cellref.hpp>
 
 namespace CSMWorld
@@ -15,6 +17,9 @@ namespace CSMWorld
         std::string mOriginalCell;
 
         CellRef();
+
+        /// Calculate cell index based on coordinates (x and y)
+        std::pair<int, int> getCellIndex() const;
     };
 }
 
diff --git a/apps/opencs/model/world/refcollection.cpp b/apps/opencs/model/world/refcollection.cpp
index 1a0dd1e5b..19dfae57d 100644
--- a/apps/opencs/model/world/refcollection.cpp
+++ b/apps/opencs/model/world/refcollection.cpp
@@ -24,9 +24,19 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
     while (ESM::Cell::getNextRef (reader, ref, deleted))
     {
         ref.mOriginalCell = cell2.mId;
-        ref.mCell = cell2.mId;
 
-        /// \todo handle moved references
+        if (cell.get().isExterior())
+        {
+            // ignoring moved references sub-record; instead calculate cell from coordinates
+            std::pair<int, int> index = ref.getCellIndex();
+
+            std::ostringstream stream;
+            stream << "#" << index.first << " " << index.second;
+
+            ref.mCell = stream.str();
+        }
+        else
+            ref.mCell = cell2.mId;
 
         std::map<ESM::RefNum, std::string>::iterator iter = cache.find (ref.mRefNum);