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

Thrown weapon fix (Fixes #2248)

Browse source
This commit is contained in:
scrawl 2015-01-04 01:33:36 +01:00
parent d56906acf7
commit 398fe6e780
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -68,9 +68,6 @@ 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())
@ -131,6 +128,9 @@ void WeaponAnimation::releaseArrow(MWWorld::Ptr actor)
if (ammo == inv.end()) if (ammo == inv.end())
return; return;
if (!mAmmunition.get())
return;
Ogre::Vector3 launchPos(0,0,0); Ogre::Vector3 launchPos(0,0,0);
if (mAmmunition->mSkelBase) if (mAmmunition->mSkelBase)
{ {