mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-07-03 20:21:36 +00:00
Code Issues Releases Wiki Activity

[Client] Don't play dying words for NPCs loaded up as dead from server

Browse source
This commit is contained in:
David Cernat 2019-12-06 14:50:10 +02:00
parent 2af811be40
commit c253950dd7
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/openmw/mwmechanics/actors.cpp
View file

@ -2010,7 +2010,17 @@ namespace MWMechanics
// Play dying words
// Note: It's not known whether the soundgen tags scream, roar, and moan are reliable
// for NPCs since some of the npc death animation files are missing them.
MWBase::Environment::get().getDialogueManager()->say(iter->first, "hit");
/*
Start of tes3mp change (major)
Don't play dying words for NPCs who have already been marked as having
finished their death animations from elsewhere in the code
*/
if (!stats.isDeathAnimationFinished())
MWBase::Environment::get().getDialogueManager()->say(iter->first, "hit");
/*
End of tes3mp change (major)
*/
// Apply soultrap
if (iter->first.getTypeName() == typeid(ESM::Creature).name())