mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 18:35:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'jeffreyhaines/npcsdontscream'

Browse Source
This commit is contained in:
Marc Zinnschlag 2015-08-20 20:28:36 +02:00
commit 5cb0353b5c
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/openmw/mwmechanics/actors.cpp
View File

@ -18,6 +18,7 @@
#include "../mwbase/world.hpp"
#include "../mwbase/environment.hpp"
#include "../mwbase/windowmanager.hpp"
#include "../mwbase/dialoguemanager.hpp"
#include "../mwbase/soundmanager.hpp"
#include "../mwbase/mechanicsmanager.hpp"
@ -1175,6 +1176,12 @@ namespace MWMechanics
if (iter->second->getCharacterController()->kill())
{
// TODO: 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.
// Play dying words
MWBase::Environment::get().getDialogueManager()->say(iter->first, "hit");
iter->first.getClass().getCreatureStats(iter->first).notifyDied();
++mDeathCount[Misc::StringUtils::lowerCase(iter->first.getCellRef().getRefId())];