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

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

Browse source
This commit is contained in:
Marc Zinnschlag 2012-09-04 15:38:21 +02:00
parent 8ed8dd649a
commit fb8aae243d
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwworld/actiontalk.cpp
View file

@ -6,10 +6,10 @@
namespace MWWorld namespace MWWorld
{ {
ActionTalk::ActionTalk (const Ptr& actor) : mActor (actor) {} ActionTalk::ActionTalk (const Ptr& actor) : Action (false, actor) {}
void ActionTalk::executeImp (const Ptr& actor) void ActionTalk::executeImp (const Ptr& actor)
{ {
MWBase::Environment::get().getDialogueManager()->startDialogue (mActor); MWBase::Environment::get().getDialogueManager()->startDialogue (getTarget());
} }
} }

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

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