mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 15:29:55 +00:00
Code Issues Releases Wiki Activity

Merge branch 'forceunequip' into 'master'

Browse source 
Force stop weapon animation before unequipping

Closes #8230

See merge request OpenMW/openmw!4460
This commit is contained in:
Alexei Kotov 2024-11-19 22:49:40 +00:00
commit 17203c5071
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/openmw/mwmechanics/character.cpp
View file

@ -1387,6 +1387,7 @@ namespace MWMechanics
else if (mWeaponType == ESM::Weapon::HandToHand) else if (mWeaponType == ESM::Weapon::HandToHand)
mAnimation->showCarriedLeft(false); mAnimation->showCarriedLeft(false);
mAnimation->disable(weapgroup);
playBlendedAnimation( playBlendedAnimation(
weapgroup, priorityWeapon, unequipMask, false, 1.0f, "unequip start", "unequip stop", 0.0f, 0); weapgroup, priorityWeapon, unequipMask, false, 1.0f, "unequip start", "unequip stop", 0.0f, 0);
mUpperBodyState = UpperBodyState::Unequipping; mUpperBodyState = UpperBodyState::Unequipping;