From c558e12212ace15ec20097b1e365a9bdfcc052aa Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 2 Jan 2014 03:06:48 +0100
Subject: [PATCH] Don't try to move objects that are not in a cell

---
 .../mwscript/transformationextensions.cpp     | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp
index 47a632ae98..e441809778 100644
--- a/apps/openmw/mwscript/transformationextensions.cpp
+++ b/apps/openmw/mwscript/transformationextensions.cpp
@@ -207,6 +207,10 @@ namespace MWScript
                 virtual void execute (Interpreter::Runtime& runtime)
                 {
                     MWWorld::Ptr ptr = R()(runtime);
+
+                    if (!ptr.isInCell())
+                        return;
+
                     if (ptr.getRefData().getHandle() == "player")
                     {
                         MWBase::Environment::get().getWorld()->getPlayer().setTeleported(true);
@@ -275,6 +279,10 @@ namespace MWScript
                 virtual void execute (Interpreter::Runtime& runtime)
                 {
                     MWWorld::Ptr ptr = R()(runtime);
+
+                    if (!ptr.isInCell())
+                        return;
+
                     if (ptr.getRefData().getHandle() == "player")
                     {
                         MWBase::Environment::get().getWorld()->getPlayer().setTeleported(true);
@@ -336,6 +344,10 @@ namespace MWScript
                 virtual void execute (Interpreter::Runtime& runtime)
                 {
                     MWWorld::Ptr ptr = R()(runtime);
+
+                    if (!ptr.isInCell())
+                        return;
+
                     if (ptr.getRefData().getHandle() == "player")
                     {
                         MWBase::Environment::get().getWorld()->getPlayer().setTeleported(true);
@@ -605,6 +617,10 @@ namespace MWScript
                 virtual void execute (Interpreter::Runtime& runtime)
                 {
                     MWWorld::Ptr ptr = R()(runtime);
+
+                    if (!ptr.isInCell())
+                        return;
+
                     ptr.getRefData().getLocalRotation().rot[0] = 0;
                     ptr.getRefData().getLocalRotation().rot[1] = 0;
                     ptr.getRefData().getLocalRotation().rot[2] = 0;
@@ -624,6 +640,9 @@ namespace MWScript
                 {
                     const MWWorld::Ptr& ptr = R()(runtime);
 
+                    if (!ptr.isInCell())
+                        return;
+
                     std::string axis = runtime.getStringLiteral (runtime[0].mInteger);
                     runtime.pop();
                     Interpreter::Type_Float movement = (runtime[0].mFloat*MWBase::Environment::get().getFrameDuration());
@@ -659,6 +678,9 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
+                    if (!ptr.isInCell())
+                        return;
+
                     std::string axis = runtime.getStringLiteral (runtime[0].mInteger);
                     runtime.pop();
                     Interpreter::Type_Float movement = (runtime[0].mFloat*MWBase::Environment::get().getFrameDuration());