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

Merge branch 'hopechess' into 'master'

Browse Source 
Unequip the weapon only after finishing the attack (bug #4610)

Closes #4610

See merge request OpenMW/openmw!2719
This commit is contained in:
psi29a 2023-02-11 10:49:08 +00:00
commit 8040d7a72a
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -3,6 +3,7 @@
Bug #4127: Weapon animation looks choppy Bug #4127: Weapon animation looks choppy
Bug #4204: Dead slaughterfish doesn't float to water surface after loading saved game Bug #4204: Dead slaughterfish doesn't float to water surface after loading saved game
Bug #4610: Casting a Bound Weapon spell cancels the casting animation by equipping the weapon prematurely
Bug #4816: GetWeaponDrawn returns 1 before weapon is attached Bug #4816: GetWeaponDrawn returns 1 before weapon is attached
Bug #5057: Weapon swing sound plays at same pitch whether it hits or misses Bug #5057: Weapon swing sound plays at same pitch whether it hits or misses
Bug #5129: Stuttering animation on Centurion Archer Bug #5129: Stuttering animation on Centurion Archer

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

@ -1321,7 +1321,8 @@ namespace MWMechanics
{ {
std::string weapgroup; std::string weapgroup;
if ((!isWerewolf || mWeaponType != ESM::Weapon::Spell) && weaptype != mWeaponType if ((!isWerewolf || mWeaponType != ESM::Weapon::Spell) && weaptype != mWeaponType
&& mUpperBodyState != UpperBodyState::Unequipping && !isStillWeapon) && mUpperBodyState <= UpperBodyState::AttackWindUp && mUpperBodyState != UpperBodyState::Unequipping
&& !isStillWeapon)
{ {
// We can not play un-equip animation if weapon changed since last update // We can not play un-equip animation if weapon changed since last update
if (!weaponChanged) if (!weaponChanged)
@ -1363,7 +1364,7 @@ namespace MWMechanics
{ {
// Weapon is changed, no current animation (e.g. unequipping or attack). // Weapon is changed, no current animation (e.g. unequipping or attack).
// Start equipping animation now. // Start equipping animation now.
if (weaptype != mWeaponType) if (weaptype != mWeaponType && mUpperBodyState <= UpperBodyState::WeaponEquipped)
{ {
forcestateupdate = true; forcestateupdate = true;
bool useShieldAnims = mAnimation->useShieldAnimations(); bool useShieldAnims = mAnimation->useShieldAnimations();