From 136813a882cbf8fabcf12d2c28c8f7a97126f5f6 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 10 May 2014 00:00:36 +0200
Subject: [PATCH] Bug #1319: Fix references not coming from a content file
 incorrectly overwriting each other

---
 apps/openmw/mwworld/cellstore.cpp | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index e5f0c4b88..1c39d2c07 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -92,14 +92,17 @@ namespace
         if (!record)
             return;
 
-        for (typename MWWorld::CellRefList<T>::List::iterator iter (collection.mList.begin());
-            iter!=collection.mList.end(); ++iter)
-            if (iter->mRef.mRefNum==state.mRef.mRefNum)
-            {
-                // overwrite existing reference
-                iter->load (state);
-                return;
-            }
+        if (state.mRef.mRefNum.mContentFile != -1)
+        {
+            for (typename MWWorld::CellRefList<T>::List::iterator iter (collection.mList.begin());
+                iter!=collection.mList.end(); ++iter)
+                if (iter->mRef.mRefNum==state.mRef.mRefNum)
+                {
+                    // overwrite existing reference
+                    iter->load (state);
+                    return;
+                }
+        }
 
         // new reference
         MWWorld::LiveCellRef<T> ref (record);