From fb8aae243dab4487e56845e45fd59f869b327f46 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Tue, 4 Sep 2012 15:38:21 +0200
Subject: [PATCH] Issue #370: replaced custom target handling in talk action
 with base class implementation

---
 apps/openmw/mwworld/actiontalk.cpp | 4 ++--
 apps/openmw/mwworld/actiontalk.hpp | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwworld/actiontalk.cpp b/apps/openmw/mwworld/actiontalk.cpp
index d94cb67f4..905497f85 100644
--- a/apps/openmw/mwworld/actiontalk.cpp
+++ b/apps/openmw/mwworld/actiontalk.cpp
@@ -6,10 +6,10 @@
 
 namespace MWWorld
 {
-    ActionTalk::ActionTalk (const Ptr& actor) : mActor (actor) {}
+    ActionTalk::ActionTalk (const Ptr& actor) : Action (false, actor) {}
 
     void ActionTalk::executeImp (const Ptr& actor)
     {
-        MWBase::Environment::get().getDialogueManager()->startDialogue (mActor);
+        MWBase::Environment::get().getDialogueManager()->startDialogue (getTarget());
     }
 }
diff --git a/apps/openmw/mwworld/actiontalk.hpp b/apps/openmw/mwworld/actiontalk.hpp
index 53adf9e53..b88b168d8 100644
--- a/apps/openmw/mwworld/actiontalk.hpp
+++ b/apps/openmw/mwworld/actiontalk.hpp
@@ -8,8 +8,6 @@ namespace MWWorld
 {
     class ActionTalk : public Action
     {
-            Ptr mActor;
-
             virtual void executeImp (const Ptr& actor);
 
         public: