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

[Client] Don't pop up dialogue screen when an NPC activates another NPC

Browse source
This commit is contained in:
David Cernat 2018-07-15 04:36:42 +03:00
parent 4ef2aff11e
commit 18a2d238ab
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apps/openmw/mwclass/npc.cpp
View file

@ -1010,6 +1010,19 @@ namespace MWClass
End of tes3mp addition End of tes3mp addition
*/ */
/*
Start of tes3mp addition
Avoid returning an ActionTalk when a non-player NPC activates another
non-player NPC, because it will always pop up a dialogue screen for
the local player
*/
if (ptr != MWMechanics::getPlayer() && actor != MWMechanics::getPlayer())
return std::shared_ptr<MWWorld::Action>(new MWWorld::FailedAction(""));
/*
End of tes3mp addition
*/
// player got activated by another NPC // player got activated by another NPC
if(ptr == MWMechanics::getPlayer()) if(ptr == MWMechanics::getPlayer())
return std::shared_ptr<MWWorld::Action>(new MWWorld::ActionTalk(actor)); return std::shared_ptr<MWWorld::Action>(new MWWorld::ActionTalk(actor));