From 666248618eb2e4ca2003f51a5dbc1891baa98998 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 2 Mar 2015 23:20:59 +0100
Subject: [PATCH] Fix reference cell movement leaving behind deleted Ptrs for
 script access

---
 apps/openmw/mwworld/worldimp.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 8a2b67bfc..3ef4f8e81 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1206,6 +1206,10 @@ namespace MWWorld
                     }
                 }
                 ptr.getRefData().setCount(0);
+                // Deleted references can still be accessed by scripts,
+                // so we need this extra step to remove access to the old reference completely.
+                // This will no longer be necessary once we have a proper cell movement tracker.
+                ptr.getCellRef().unsetRefNum();
             }
         }
         if (haveToMove && ptr.getRefData().getBaseNode())