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

Fix equipment update removing ammunition (Fixes #2144)

Browse source
This commit is contained in:
scrawl 2014-12-30 16:22:06 +01:00
parent 18fb3f831a
commit 9c693d078b
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -361,6 +361,8 @@ void NpcAnimation::updateParts()
}; };
static const size_t slotlistsize = sizeof(slotlist)/sizeof(slotlist[0]); static const size_t slotlistsize = sizeof(slotlist)/sizeof(slotlist[0]);
bool wasArrowAttached = (mAmmunition.get());
MWWorld::InventoryStore& inv = mPtr.getClass().getInventoryStore(mPtr); MWWorld::InventoryStore& inv = mPtr.getClass().getInventoryStore(mPtr);
for(size_t i = 0;i < slotlistsize && mViewMode != VM_HeadOnly;i++) for(size_t i = 0;i < slotlistsize && mViewMode != VM_HeadOnly;i++)
{ {
@ -555,6 +557,9 @@ void NpcAnimation::updateParts()
"meshes\\"+bodypart->mModel); "meshes\\"+bodypart->mModel);
} }
} }
if (wasArrowAttached)
attachArrow();
} }
void NpcAnimation::addFirstPersonOffset(const Ogre::Vector3 &offset) void NpcAnimation::addFirstPersonOffset(const Ogre::Vector3 &offset)

5
apps/openmw/mwrender/weaponanimation.cpp
View file

@ -49,6 +49,8 @@ void WeaponAnimation::attachArrow(MWWorld::Ptr actor)
else else
{ {
NifOgre::ObjectScenePtr weapon = getWeapon(); NifOgre::ObjectScenePtr weapon = getWeapon();
if (!weapon.get())
return;
MWWorld::ContainerStoreIterator ammo = inv.getSlot(MWWorld::InventoryStore::Slot_Ammunition); MWWorld::ContainerStoreIterator ammo = inv.getSlot(MWWorld::InventoryStore::Slot_Ammunition);
if (ammo == inv.end()) if (ammo == inv.end())
@ -66,6 +68,9 @@ void WeaponAnimation::attachArrow(MWWorld::Ptr actor)
void WeaponAnimation::releaseArrow(MWWorld::Ptr actor) void WeaponAnimation::releaseArrow(MWWorld::Ptr actor)
{ {
if (!mAmmunition.get())
return;
MWWorld::InventoryStore& inv = actor.getClass().getInventoryStore(actor); MWWorld::InventoryStore& inv = actor.getClass().getInventoryStore(actor);
MWWorld::ContainerStoreIterator weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight); MWWorld::ContainerStoreIterator weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
if (weapon == inv.end()) if (weapon == inv.end())