mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-13 19:39:44 +00:00
Code Issues Releases Wiki Activity

Fix up the merge a bit

Browse source
This commit is contained in:
scrawl 2014-01-11 02:12:41 +01:00
parent fefaec5804
commit aba72ffefe
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -797,6 +797,10 @@ namespace MWMechanics
}
}
if (iter->second->kill())
{
++mDeathCount[cls.getId(iter->first)];
// Apply soultrap
if (iter->first.getTypeName() == typeid(ESM::Creature).name())
{
@ -809,10 +813,6 @@ namespace MWMechanics
stats.setMagicEffects(MWMechanics::MagicEffects());
calculateCreatureStatModifiers(iter->first, 0);
if (iter->second->kill())
{
++mDeathCount[cls.getId(iter->first)];
if(cls.isEssential(iter->first))
MWBase::Environment::get().getWindowManager()->messageBox("#{sKilledEssential}");
}