mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-07 13:20:25 +00:00
Code Issues Projects Releases Wiki Activity

Use the Weapon Bone as fallback

Browse Source
This commit is contained in:
Andrei Kortunov 2019-08-09 10:00:40 +04:00
parent f0cef772fa
commit afaff8231d
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/openmw/mwmechanics/weapontype.hpp
View File

@ -197,7 +197,7 @@ namespace MWMechanics
/* short group */ "1h", /* short group */ "1h",
/* long group */ "bowandarrow", /* long group */ "bowandarrow",
/* sound ID */ "Item Weapon Bow", /* sound ID */ "Item Weapon Bow",
/* attach bone */ "Weapon Bone", /* attach bone */ "Weapon Bone Left",
/* sheath bone */ "Bip01 MarksmanBow", /* sheath bone */ "Bip01 MarksmanBow",
/* usage skill */ ESM::Skill::Marksman, /* usage skill */ ESM::Skill::Marksman,
/* weapon class*/ ESM::WeaponType::Ranged, /* weapon class*/ ESM::WeaponType::Ranged,

7
apps/openmw/mwrender/creatureanimation.cpp
View File

@ -119,6 +119,13 @@ void CreatureWeaponAnimation::updatePart(PartHolderPtr& scene, int slot)
{ {
int type = item.get<ESM::Weapon>()->mBase->mData.mType; int type = item.get<ESM::Weapon>()->mBase->mData.mType;
bonename = MWMechanics::getWeaponType(type)->mAttachBone; bonename = MWMechanics::getWeaponType(type)->mAttachBone;
if (bonename != "Weapon Bone")
{
const NodeMap& nodeMap = getNodeMap();
NodeMap::const_iterator found = nodeMap.find(Misc::StringUtils::lowerCase(bonename));
if (found == nodeMap.end())
bonename = "Weapon Bone";
}
} }
else else
bonename = "Weapon Bone"; bonename = "Weapon Bone";

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

@ -745,7 +745,15 @@ bool NpcAnimation::addOrReplaceIndividualPart(ESM::PartReferenceType type, int g
if(weapon != inv.end() && weapon->getTypeName() == typeid(ESM::Weapon).name()) if(weapon != inv.end() && weapon->getTypeName() == typeid(ESM::Weapon).name())
{ {
int weaponType = weapon->get<ESM::Weapon>()->mBase->mData.mType; int weaponType = weapon->get<ESM::Weapon>()->mBase->mData.mType;
bonename = MWMechanics::getWeaponType(weaponType)->mAttachBone; const std::string weaponBonename = MWMechanics::getWeaponType(weaponType)->mAttachBone;
if (weaponBonename != bonename)
{
const NodeMap& nodeMap = getNodeMap();
NodeMap::const_iterator found = nodeMap.find(Misc::StringUtils::lowerCase(weaponBonename));
if (found != nodeMap.end())
bonename = weaponBonename;
}
} }
} }