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

npc swap cheaper ring during auto equip

Browse source
This commit is contained in:
glbwsk 2017-10-13 15:16:07 +02:00
parent e6e482ea98
commit ff9cb22a58
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
apps/openmw/mwworld/inventorystore.cpp
View file

@ -321,13 +321,23 @@ void MWWorld::InventoryStore::autoEquip (const MWWorld::Ptr& actor)
else if (iter.getType() == ContainerStore::Type_Clothing) else if (iter.getType() == ContainerStore::Type_Clothing)
{ {
// if left ring is equipped // if left ring is equipped
if (*iter2 == MWWorld::InventoryStore::Slot_LeftRing) if (*iter2 == Slot_LeftRing)
{ {
// if there is a place for right ring dont swap left leaving right hand empty // if there is a place for right ring dont swap left leaving right hand empty
if (slots_.at(MWWorld::InventoryStore::Slot_RightRing) == end()) if (slots_.at(Slot_RightRing) == end())
{ {
continue; continue;
} }
else // if right ring is equipped too
{
Ptr rightRing = *slots_.at(Slot_RightRing);
// we want to swap cheaper ring only if both are equipped
if (rightRing.getClass().getValue(rightRing) < old.getClass().getValue(old))
{
continue;
}
}
} }
if (old.getTypeName() == typeid(ESM::Clothing).name()) if (old.getTypeName() == typeid(ESM::Clothing).name())