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

Merge pull request #1581

Browse source
This commit is contained in:
scrawl 2017-12-08 20:00:15 +00:00
commit b12cd1f5b2
No known key found for this signature in database
GPG key ID: 2E6CC3676024C402
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1129,6 +1129,15 @@ namespace MWClass
else else
{ {
ratings[i] = it->getClass().getEffectiveArmorRating(*it, ptr); ratings[i] = it->getClass().getEffectiveArmorRating(*it, ptr);
// Take in account armor condition
const bool hasHealth = it->getClass().hasItemHealth(*it);
if (hasHealth)
{
int armorHealth = it->getClass().getItemHealth(*it);
int armorMaxHealth = it->getClass().getItemMaxHealth(*it);
ratings[i] *= (float(armorHealth) / armorMaxHealth);
}
} }
} }