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

Remove the beast-race special cases from updateParts

Browse source 
The special handling should happen at a much lower level, and prevent the
objects from being equipped in the first place.
This commit is contained in:
Chris Robinson 2012-07-21 17:12:41 -07:00
parent c5b9098517
commit e81fc42daa
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/openmw/mwrender/npcanimation.cpp
View file

@ -149,7 +149,7 @@ void NpcAnimation::updateParts()
{ &greaves, MWWorld::InventoryStore::Slot_Greaves },
{ &leftpauldron, MWWorld::InventoryStore::Slot_LeftPauldron },
{ &rightpauldron, MWWorld::InventoryStore::Slot_RightPauldron },
{ &boots, MWWorld::InventoryStore::Slot_Boots }, // !isBeast
{ &boots, MWWorld::InventoryStore::Slot_Boots },
{ &leftglove, MWWorld::InventoryStore::Slot_LeftGauntlet },
{ &rightglove, MWWorld::InventoryStore::Slot_RightGauntlet },
{ &shirt, MWWorld::InventoryStore::Slot_Shirt },
@ -157,9 +157,6 @@ void NpcAnimation::updateParts()
};
for(size_t i = 0;i < sizeof(slotlist)/sizeof(slotlist[0]);i++)
{
if(slotlist[i].iter == &boots && isBeast)
continue;
MWWorld::ContainerStoreIterator iter = mInv.getSlot(slotlist[i].slot);
if(*slotlist[i].iter != iter)
{
@ -235,7 +232,7 @@ void NpcAnimation::updateParts()
std::vector<ESM::PartReference> parts = armor->parts.parts;
addPartGroup(MWWorld::InventoryStore::Slot_RightPauldron, 3, parts);
}
if(!isBeast && boots != mInv.end())
if(boots != mInv.end())
{
if(boots->getTypeName() == typeid(ESM::Clothing).name())
{