mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-22 23:11:33 +00:00
Code Issues Releases Wiki Activity

Use enchanted glow for pulled arrows

Browse source
This commit is contained in:
Andrei Kortunov 2019-08-07 09:45:10 +04:00
parent 4c92f0c4e1
commit 1eed511b4e
2 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/openmw/mwrender/creatureanimation.cpp
View file

@ -173,6 +173,16 @@ bool CreatureWeaponAnimation::isArrowAttached() const
void CreatureWeaponAnimation::attachArrow() void CreatureWeaponAnimation::attachArrow()
{ {
WeaponAnimation::attachArrow(mPtr); WeaponAnimation::attachArrow(mPtr);
const MWWorld::InventoryStore& inv = mPtr.getClass().getInventoryStore(mPtr);
MWWorld::ConstContainerStoreIterator ammo = inv.getSlot(MWWorld::InventoryStore::Slot_Ammunition);
if (ammo != inv.end() && !ammo->getClass().getEnchantment(*ammo).empty())
{
osg::Group* bone = getArrowBone();
if (bone != nullptr && bone->getNumChildren())
addGlow(bone->getChild(0), ammo->getClass().getEnchantmentColor(*ammo));
}
updateQuiver(); updateQuiver();
} }

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

@ -947,6 +947,16 @@ void NpcAnimation::showCarriedLeft(bool show)
void NpcAnimation::attachArrow() void NpcAnimation::attachArrow()
{ {
WeaponAnimation::attachArrow(mPtr); WeaponAnimation::attachArrow(mPtr);
const MWWorld::InventoryStore& inv = mPtr.getClass().getInventoryStore(mPtr);
MWWorld::ConstContainerStoreIterator ammo = inv.getSlot(MWWorld::InventoryStore::Slot_Ammunition);
if (ammo != inv.end() && !ammo->getClass().getEnchantment(*ammo).empty())
{
osg::Group* bone = getArrowBone();
if (bone != nullptr && bone->getNumChildren())
addGlow(bone->getChild(0), ammo->getClass().getEnchantmentColor(*ammo));
}
updateQuiver(); updateQuiver();
} }