mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-05 14:11:32 +00:00
Code Issues Releases Wiki Activity

Merge branch 'equipunequip' into 'master'

Browse source 
Allow equip attach/detach keys to coincide with the start key

See merge request OpenMW/openmw!4691
This commit is contained in:
psi29a 2025-05-23 07:26:58 +00:00
commit 42ca8e31eb
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1388,6 +1388,7 @@ namespace MWMechanics
// Note: we do not disable unequipping animation automatically to avoid body desync // Note: we do not disable unequipping animation automatically to avoid body desync
weapgroup = getWeaponAnimation(mWeaponType); weapgroup = getWeaponAnimation(mWeaponType);
int unequipMask = MWRender::BlendMask_All; int unequipMask = MWRender::BlendMask_All;
mUpperBodyState = UpperBodyState::Unequipping;
bool useShieldAnims = mAnimation->useShieldAnimations(); bool useShieldAnims = mAnimation->useShieldAnimations();
if (useShieldAnims && mWeaponType != ESM::Weapon::HandToHand && mWeaponType != ESM::Weapon::Spell if (useShieldAnims && mWeaponType != ESM::Weapon::HandToHand && mWeaponType != ESM::Weapon::Spell
&& !(mWeaponType == ESM::Weapon::None && weaptype == ESM::Weapon::Spell)) && !(mWeaponType == ESM::Weapon::None && weaptype == ESM::Weapon::Spell))
@ -1402,7 +1403,6 @@ namespace MWMechanics
mAnimation->disable(weapgroup); 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;
mAnimation->detachArrow(); mAnimation->detachArrow();
@ -1447,6 +1447,7 @@ namespace MWMechanics
{ {
mAnimation->showWeapons(false); mAnimation->showWeapons(false);
int equipMask = MWRender::BlendMask_All; int equipMask = MWRender::BlendMask_All;
mUpperBodyState = UpperBodyState::Equipping;
if (useShieldAnims && weaptype != ESM::Weapon::Spell) if (useShieldAnims && weaptype != ESM::Weapon::Spell)
{ {
equipMask = equipMask | ~MWRender::BlendMask_LeftArm; equipMask = equipMask | ~MWRender::BlendMask_LeftArm;
@ -1459,7 +1460,6 @@ namespace MWMechanics
playBlendedAnimation(weapgroup, priorityWeapon, equipMask, true, 1.0f, "equip start", playBlendedAnimation(weapgroup, priorityWeapon, equipMask, true, 1.0f, "equip start",
"equip stop", 0.0f, 0); "equip stop", 0.0f, 0);
} }
mUpperBodyState = UpperBodyState::Equipping;
// If we do not have the "equip attach" key, show weapon manually. // If we do not have the "equip attach" key, show weapon manually.
if (weaptype != ESM::Weapon::Spell if (weaptype != ESM::Weapon::Spell