AnarchistGamers/openmw
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-09-08 03:41:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixed autoequiping rings by npc - now checks if right hand is free

Browse Source
This commit is contained in:
glbwsk 2017-10-13 14:39:44 +02:00
parent 479f9535b4
commit a25903b075
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -7,6 +7,7 @@ Makefile
makefile makefile
build* build*
prebuilt prebuilt
cmake-build-debug/
##windows build process ##windows build process
/deps /deps

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

@ -315,6 +315,14 @@ void MWWorld::InventoryStore::autoEquip (const MWWorld::Ptr& actor)
} }
else if (iter.getType() == ContainerStore::Type_Clothing) else if (iter.getType() == ContainerStore::Type_Clothing)
{ {
if (*iter2 == MWWorld::InventoryStore::Slot_LeftRing)
{
if (slots_.at(MWWorld::InventoryStore::Slot_RightRing) == end())
{
continue;
}
}
if (old.getTypeName() == typeid(ESM::Clothing).name()) if (old.getTypeName() == typeid(ESM::Clothing).name())
{ {
// check value // check value