mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-06 00:40:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1213 from Allofich/equip

Browse Source 
Change AI equip logic
This commit is contained in:
scrawl 2017-02-19 10:47:19 +01:00 committed by GitHub
commit e4741db069
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/openmw/mwworld/inventorystore.cpp
View File

@ -290,11 +290,17 @@ void MWWorld::InventoryStore::autoEquip (const MWWorld::Ptr& actor)
if (iter.getType() == ContainerStore::Type_Armor) if (iter.getType() == ContainerStore::Type_Armor)
{ {
if (old.getTypeName() == typeid(ESM::Armor).name()) if (old.getTypeName() == typeid(ESM::Armor).name())
{
if (old.get<ESM::Armor>()->mBase->mData.mType < test.get<ESM::Armor>()->mBase->mData.mType)
continue;
if (old.get<ESM::Armor>()->mBase->mData.mType == test.get<ESM::Armor>()->mBase->mData.mType)
{ {
if (old.getClass().getEffectiveArmorRating(old, actor) >= test.getClass().getEffectiveArmorRating(test, actor)) if (old.getClass().getEffectiveArmorRating(old, actor) >= test.getClass().getEffectiveArmorRating(test, actor))
// old armor had better armor rating // old armor had better armor rating
continue; continue;
} }
}
// suitable armor should replace already equipped clothing // suitable armor should replace already equipped clothing
} }
else if (iter.getType() == ContainerStore::Type_Clothing) else if (iter.getType() == ContainerStore::Type_Clothing)