From f3d4b63aaf39d20ac9f9c10b9a376eb24b348cb7 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 11 Sep 2014 05:48:46 +0200
Subject: [PATCH] Fix AI moving load doors and throw an exception when trying
 to do this (Fixes #1907)

---
 apps/openmw/mwbase/world.hpp            | 1 +
 apps/openmw/mwclass/door.cpp            | 3 +++
 apps/openmw/mwmechanics/aipackage.cpp   | 2 +-
 apps/openmw/mwscript/miscextensions.cpp | 2 +-
 apps/openmw/mwworld/worldimp.hpp        | 1 +
 5 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index f07bb3eb9..2055aeeae 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -396,6 +396,7 @@ namespace MWBase
             virtual void activateDoor(const MWWorld::Ptr& door) = 0;
             /// update movement state of a non-teleport door as specified
             /// @param state see MWClass::setDoorState
+            /// @note throws an exception when invoked on a teleport door
             virtual void activateDoor(const MWWorld::Ptr& door, int state) = 0;
 
             virtual bool getPlayerStandingOn (const MWWorld::Ptr& object) = 0; ///< @return true if the player is standing on \a object
diff --git a/apps/openmw/mwclass/door.cpp b/apps/openmw/mwclass/door.cpp
index 153432af6..fa9db9e16 100644
--- a/apps/openmw/mwclass/door.cpp
+++ b/apps/openmw/mwclass/door.cpp
@@ -324,6 +324,9 @@ namespace MWClass
 
     void Door::setDoorState (const MWWorld::Ptr &ptr, int state) const
     {
+        if (ptr.getCellRef().getTeleport())
+            throw std::runtime_error("load doors can't be moved");
+
         ensureCustomData(ptr);
         DoorCustomData& customData = dynamic_cast<DoorCustomData&>(*ptr.getRefData().getCustomData());
         customData.mDoorState = state;
diff --git a/apps/openmw/mwmechanics/aipackage.cpp b/apps/openmw/mwmechanics/aipackage.cpp
index ff0329341..f015bb8a4 100644
--- a/apps/openmw/mwmechanics/aipackage.cpp
+++ b/apps/openmw/mwmechanics/aipackage.cpp
@@ -97,7 +97,7 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, ESM::Pathgrid::Po
             MWWorld::Ptr door = getNearbyDoor(actor);
             if(door != MWWorld::Ptr()) // NOTE: checks interior cells only
             {
-                if(door.getCellRef().getTrap().empty() && door.getClass().getDoorState(door) == 0) { //Open the door if untrapped
+                if(!door.getCellRef().getTeleport() && door.getCellRef().getTrap().empty() && door.getClass().getDoorState(door) == 0) { //Open the door if untrapped
                     MWBase::Environment::get().getWorld()->activateDoor(door, 1);
                 }
             }
diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp
index 6da047196..bd91943ad 100644
--- a/apps/openmw/mwscript/miscextensions.cpp
+++ b/apps/openmw/mwscript/miscextensions.cpp
@@ -148,7 +148,7 @@ namespace MWScript
 
                     // Instantly reset door to closed state
                     // This is done when using Lock in scripts, but not when using Lock spells.
-                    if (ptr.getTypeName() == typeid(ESM::Door).name())
+                    if (ptr.getTypeName() == typeid(ESM::Door).name() && !ptr.getCellRef().getTeleport())
                     {
                         MWBase::Environment::get().getWorld()->activateDoor(ptr, 0);
                         MWBase::Environment::get().getWorld()->localRotateObject(ptr, 0, 0, 0);
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index dd7729331..4363f77fb 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -477,6 +477,7 @@ namespace MWWorld
 
             /// update movement state of a non-teleport door as specified
             /// @param state see MWClass::setDoorState
+            /// @note throws an exception when invoked on a teleport door
             virtual void activateDoor(const MWWorld::Ptr& door, int state);
 
             virtual bool getPlayerStandingOn (const MWWorld::Ptr& object); ///< @return true if the player is standing on \a object