mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-04 12:39:55 +00:00
Code Issues Projects Releases Wiki Activity

Do not play un-equipping animation when we switch to hand-to-hand

Browse Source
This commit is contained in:
Andrei Kortunov 2018-07-17 14:06:41 +04:00
parent 1430b64aaa
commit 38fa4e0a8a
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1229,12 +1229,17 @@ bool CharacterController::updateWeaponState()
&& mUpperBodyState != UpperCharState_UnEquipingWeap && mUpperBodyState != UpperCharState_UnEquipingWeap
&& !isStillWeapon) && !isStillWeapon)
{ {
// Note: we do not disable unequipping animation automatically to avoid body desync // We can not play un-equip animation when we switch to HtH
getWeaponGroup(mWeaponType, weapgroup); // because we already un-equipped weapon
mAnimation->play(weapgroup, priorityWeapon, if (weaptype != WeapType_HandToHand || mWeaponType == WeapType_Spell)
MWRender::Animation::BlendMask_All, false, {
1.0f, "unequip start", "unequip stop", 0.0f, 0); // Note: we do not disable unequipping animation automatically to avoid body desync
mUpperBodyState = UpperCharState_UnEquipingWeap; getWeaponGroup(mWeaponType, weapgroup);
mAnimation->play(weapgroup, priorityWeapon,
MWRender::Animation::BlendMask_All, false,
1.0f, "unequip start", "unequip stop", 0.0f, 0);
mUpperBodyState = UpperCharState_UnEquipingWeap;
}
if(!downSoundId.empty()) if(!downSoundId.empty())
{ {