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

Revert "bug fix http://bugs.openmw.org/issues/985"

Browse source 
This reverts commit 7a9b64c6f4.
This commit is contained in:
mrcheko 2013-12-13 19:02:25 +02:00
parent 7a9b64c6f4
commit c8bf69b91a
1 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,23 +1,15 @@
#include "actiontalk.hpp" #include "actiontalk.hpp"
#include "class.hpp"
#include "../mwbase/environment.hpp" #include "../mwbase/environment.hpp"
#include "../mwbase/dialoguemanager.hpp" #include "../mwbase/dialoguemanager.hpp"
#include "../mwmechanics/creaturestats.hpp"
namespace MWWorld namespace MWWorld
{ {
ActionTalk::ActionTalk (const Ptr& actor) : Action (false, actor) {} ActionTalk::ActionTalk (const Ptr& actor) : Action (false, actor) {}
void ActionTalk::executeImp (const Ptr& actor) void ActionTalk::executeImp (const Ptr& actor)
{ {
MWWorld::Ptr talkTo = getTarget(); //because 'actor' is always the player! MWBase::Environment::get().getDialogueManager()->startDialogue (getTarget());
if ( MWWorld::Class::get(talkTo).getCreatureStats(talkTo).isHostile() )
return;
MWBase::Environment::get().getDialogueManager()->startDialogue (talkTo);
} }
} }