Skip to content

Commit

Permalink
Merge branch 'forceunequip' into 'master'
Browse files Browse the repository at this point in the history
Force stop weapon animation before unequipping

Closes #8230

See merge request OpenMW/openmw!4460
  • Loading branch information
Capostrophic committed Nov 19, 2024
2 parents b6a1461 + d3db436 commit 17203c5
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions apps/openmw/mwmechanics/character.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1387,6 +1387,7 @@ namespace MWMechanics
else if (mWeaponType == ESM::Weapon::HandToHand)
mAnimation->showCarriedLeft(false);

mAnimation->disable(weapgroup);
playBlendedAnimation(
weapgroup, priorityWeapon, unequipMask, false, 1.0f, "unequip start", "unequip stop", 0.0f, 0);
mUpperBodyState = UpperBodyState::Unequipping;
Expand Down

0 comments on commit 17203c5

Please sign in to comment.