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

Fix 'failed to find animation' warnings when a spell was equipped before the werewolf transformation

Browse Source
This commit is contained in:
scrawl 2015-12-26 18:45:09 +01:00
parent 6b67911658
commit 0bec6e5fbe
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apps/openmw/mwmechanics/character.cpp
View File

@ -520,6 +520,8 @@ void getWeaponGroup(WeaponType weaptype, std::string &group)
const WeaponInfo *info = std::find_if(sWeaponTypeList, sWeaponTypeListEnd, FindWeaponType(weaptype)); const WeaponInfo *info = std::find_if(sWeaponTypeList, sWeaponTypeListEnd, FindWeaponType(weaptype));
if(info != sWeaponTypeListEnd) if(info != sWeaponTypeListEnd)
group = info->longgroup; group = info->longgroup;
else
group.clear();
} }
@ -1092,11 +1094,14 @@ bool CharacterController::updateWeaponState()
std::string weapgroup; std::string weapgroup;
if(weaptype == WeapType_None) if(weaptype == WeapType_None)
{ {
getWeaponGroup(mWeaponType, weapgroup); if ((!isWerewolf || mWeaponType != WeapType_Spell))
mAnimation->play(weapgroup, priorityWeapon, {
MWRender::Animation::BlendMask_All, true, getWeaponGroup(mWeaponType, weapgroup);
1.0f, "unequip start", "unequip stop", 0.0f, 0); mAnimation->play(weapgroup, priorityWeapon,
mUpperBodyState = UpperCharState_UnEquipingWeap; MWRender::Animation::BlendMask_All, true,
1.0f, "unequip start", "unequip stop", 0.0f, 0);
mUpperBodyState = UpperCharState_UnEquipingWeap;
}
} }
else else
{ {