From e5b19cf3c696b5c4b392112c2b785799e2b9a66a Mon Sep 17 00:00:00 2001
From: gus <gus_512@hotmail.com>
Date: Mon, 17 Feb 2014 10:37:11 +0100
Subject: [PATCH] clean up

---
 apps/openmw/mwclass/door.cpp | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/apps/openmw/mwclass/door.cpp b/apps/openmw/mwclass/door.cpp
index a846a84923..e9ac39f1d1 100644
--- a/apps/openmw/mwclass/door.cpp
+++ b/apps/openmw/mwclass/door.cpp
@@ -115,21 +115,11 @@ namespace MWClass
 
             if (ref->mRef.mTeleport)
             {
-                // teleport door
-                /// \todo remove this if clause once ActionTeleport can also support other actors
-                //if (MWBase::Environment::get().getWorld()->getPlayerPtr()==actor)
-                //{
-                    boost::shared_ptr<MWWorld::Action> action(new MWWorld::ActionTeleport (ref->mRef.mDestCell, ref->mRef.mDoorDest));
+                boost::shared_ptr<MWWorld::Action> action(new MWWorld::ActionTeleport (ref->mRef.mDestCell, ref->mRef.mDoorDest));
 
-                    action->setSound(openSound);
+                action->setSound(openSound);
 
-                    return action;
-                /*}
-                else
-                {
-                    // another NPC or a creature is using the door
-                    return boost::shared_ptr<MWWorld::Action> (new MWWorld::FailedAction);
-                }*/
+                return action;
             }
             else
             {