From 373de19aeec752958a37e9fe0f120ef95493ab1d Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 17 Feb 2013 03:02:47 +0100
Subject: [PATCH] Removed dialogue fix again, now on separate branch

---
 apps/openmw/mwworld/actiontalk.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwworld/actiontalk.cpp b/apps/openmw/mwworld/actiontalk.cpp
index 36c54f00e..6bee9eb26 100644
--- a/apps/openmw/mwworld/actiontalk.cpp
+++ b/apps/openmw/mwworld/actiontalk.cpp
@@ -11,11 +11,7 @@ namespace MWWorld
 
     bool ActionTalk::executeImp (const Ptr& actor)
     {
-        if (MWBase::Environment::get().getInputManager ()->getControlSwitch ("playercontrols"))
-        {
-            MWBase::Environment::get().getDialogueManager()->startDialogue (getTarget());
-            return true;
-        }
-        return false;
+        MWBase::Environment::get().getDialogueManager()->startDialogue (getTarget());
+        return true;
     }
 }