From ea1c3fe1e46de41d49c85e002da17c0f86768644 Mon Sep 17 00:00:00 2001 From: Marc Zinnschlag Date: Tue, 4 Sep 2012 15:29:51 +0200 Subject: [PATCH] Issue #370: replaced custom target handling in open action with base class implementation --- apps/openmw/mwworld/actionopen.cpp | 6 +++--- apps/openmw/mwworld/actionopen.hpp | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/apps/openmw/mwworld/actionopen.cpp b/apps/openmw/mwworld/actionopen.cpp index 15a9f510d..040a3856e 100644 --- a/apps/openmw/mwworld/actionopen.cpp +++ b/apps/openmw/mwworld/actionopen.cpp @@ -10,8 +10,8 @@ namespace MWWorld { - ActionOpen::ActionOpen (const MWWorld::Ptr& container) : mContainer (container) { - mContainer = container; + ActionOpen::ActionOpen (const MWWorld::Ptr& container) : Action (false, container) + { } void ActionOpen::executeImp (const MWWorld::Ptr& actor) @@ -20,6 +20,6 @@ namespace MWWorld return; MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_Container); - MWBase::Environment::get().getWindowManager()->getContainerWindow()->open(mContainer); + MWBase::Environment::get().getWindowManager()->getContainerWindow()->open(getTarget()); } } diff --git a/apps/openmw/mwworld/actionopen.hpp b/apps/openmw/mwworld/actionopen.hpp index 5666ff293..c49ebefa5 100644 --- a/apps/openmw/mwworld/actionopen.hpp +++ b/apps/openmw/mwworld/actionopen.hpp @@ -10,8 +10,6 @@ namespace MWWorld { class ActionOpen : public Action { - Ptr mContainer; - virtual void executeImp (const MWWorld::Ptr& actor); public: