teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Issue #370: replaced custom target handling in open action with base class implementation

Browse source
This commit is contained in:
Marc Zinnschlag 2012-09-04 15:29:51 +02:00
parent 8c2b4f996c
commit ea1c3fe1e4
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/openmw/mwworld/actionopen.cpp
View file

@ -10,8 +10,8 @@
namespace MWWorld namespace MWWorld
{ {
ActionOpen::ActionOpen (const MWWorld::Ptr& container) : mContainer (container) { ActionOpen::ActionOpen (const MWWorld::Ptr& container) : Action (false, container)
mContainer = container; {
} }
void ActionOpen::executeImp (const MWWorld::Ptr& actor) void ActionOpen::executeImp (const MWWorld::Ptr& actor)
@ -20,6 +20,6 @@ namespace MWWorld
return; return;
MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_Container); MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_Container);
MWBase::Environment::get().getWindowManager()->getContainerWindow()->open(mContainer); MWBase::Environment::get().getWindowManager()->getContainerWindow()->open(getTarget());
} }
} }

2
apps/openmw/mwworld/actionopen.hpp
View file

@ -10,8 +10,6 @@ namespace MWWorld
{ {
class ActionOpen : public Action class ActionOpen : public Action
{ {
Ptr mContainer;
virtual void executeImp (const MWWorld::Ptr& actor); virtual void executeImp (const MWWorld::Ptr& actor);
public: public: