From e8f68973760e32e77b8488e916ff603c3edad2b1 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Tue, 6 Oct 2015 14:30:32 +0200
Subject: [PATCH] fixed a possible script bug regarding ID-access for instances
 that did not yet existed when the script was compiled

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

diff --git a/apps/openmw/mwscript/compilercontext.cpp b/apps/openmw/mwscript/compilercontext.cpp
index 083f463bc..cf5eff9e7 100644
--- a/apps/openmw/mwscript/compilercontext.cpp
+++ b/apps/openmw/mwscript/compilercontext.cpp
@@ -12,6 +12,7 @@
 
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/class.hpp"
+#include "../mwworld/manualref.hpp"
 
 namespace MWScript
 {
@@ -42,9 +43,9 @@ namespace MWScript
         }
         else
         {
-            MWWorld::Ptr ptr = MWBase::Environment::get().getWorld()->getPtr (id, false);
+            MWWorld::ManualRef ref (MWBase::Environment::get().getWorld()->getStore(), id);
 
-            script = ptr.getClass().getScript (ptr);
+            script = ref.getPtr().getClass().getScript (ref.getPtr());
             reference = true;
         }