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

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

diff --git a/apps/openmw/mwworld/actionread.cpp b/apps/openmw/mwworld/actionread.cpp
index 5c6ab93c1..7fb2b23e7 100644
--- a/apps/openmw/mwworld/actionread.cpp
+++ b/apps/openmw/mwworld/actionread.cpp
@@ -8,23 +8,23 @@
 
 namespace MWWorld
 {
-    ActionRead::ActionRead (const MWWorld::Ptr& object) : mObject (object)
+    ActionRead::ActionRead (const MWWorld::Ptr& object) : Action (false, object)
     {
     }
 
     void ActionRead::executeImp (const MWWorld::Ptr& actor)
     {
-        LiveCellRef<ESM::Book> *ref = mObject.get<ESM::Book>();
+        LiveCellRef<ESM::Book> *ref = getTarget().get<ESM::Book>();
 
         if (ref->base->data.isScroll)
         {
             MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_Scroll);
-            MWBase::Environment::get().getWindowManager()->getScrollWindow()->open(mObject);
+            MWBase::Environment::get().getWindowManager()->getScrollWindow()->open(getTarget());
         }
         else
         {
             MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_Book);
-            MWBase::Environment::get().getWindowManager()->getBookWindow()->open(mObject);
+            MWBase::Environment::get().getWindowManager()->getBookWindow()->open(getTarget());
         }
     }
 }
diff --git a/apps/openmw/mwworld/actionread.hpp b/apps/openmw/mwworld/actionread.hpp
index 9bb74fb88..00a4756dd 100644
--- a/apps/openmw/mwworld/actionread.hpp
+++ b/apps/openmw/mwworld/actionread.hpp
@@ -8,8 +8,6 @@ namespace MWWorld
 {
     class ActionRead : public Action
     {
-            Ptr mObject; // book or scroll to read
-
             virtual void executeImp (const MWWorld::Ptr& actor);
 
         public: