diff --git a/apps/openmw/mwworld/actionread.cpp b/apps/openmw/mwworld/actionread.cpp index 5c6ab93c12..7fb2b23e70 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 *ref = mObject.get(); + LiveCellRef *ref = getTarget().get(); 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 9bb74fb887..00a4756dda 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: