AnarchistGamers/openmw
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-09-08 03:41:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'equipunequipwhatsthedifference' into 'master'

Browse Source 
Allow weapon equip/unequip animations to intersect (#7886)

Closes #7886

See merge request OpenMW/openmw!3951
This commit is contained in:
psi29a 2024-04-02 07:34:31 +00:00
commit 46bf6c12b6
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -162,6 +162,7 @@
Bug #7859: AutoCalc flag is not used to calculate potion value Bug #7859: AutoCalc flag is not used to calculate potion value
Bug #7861: OpenMW-CS: Incorrect DIAL's type in INFO records Bug #7861: OpenMW-CS: Incorrect DIAL's type in INFO records
Bug #7872: Region sounds use wrong odds Bug #7872: Region sounds use wrong odds
Bug #7886: Equip and unequip animations can't share the animation track section
Bug #7887: Editor: Mismatched reported script data size and actual data size causes a crash during save Bug #7887: Editor: Mismatched reported script data size and actual data size causes a crash during save
Bug #7898: Editor: Invalid reference scales are allowed Bug #7898: Editor: Invalid reference scales are allowed
Bug #7899: Editor: Doors can't be unlocked Bug #7899: Editor: Doors can't be unlocked

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

@ -1060,17 +1060,23 @@ namespace MWMechanics
std::string_view action = evt.substr(groupname.size() + 2); std::string_view action = evt.substr(groupname.size() + 2);
if (action == "equip attach") if (action == "equip attach")
{ {
if (groupname == "shield") if (mUpperBodyState == UpperBodyState::Equipping)
mAnimation->showCarriedLeft(true); {
else if (groupname == "shield")
mAnimation->showWeapons(true); mAnimation->showCarriedLeft(true);
else
mAnimation->showWeapons(true);
}
} }
else if (action == "unequip detach") else if (action == "unequip detach")
{ {
if (groupname == "shield") if (mUpperBodyState == UpperBodyState::Unequipping)
mAnimation->showCarriedLeft(false); {
else if (groupname == "shield")
mAnimation->showWeapons(false); mAnimation->showCarriedLeft(false);
else
mAnimation->showWeapons(false);
}
} }
else if (action == "chop hit" || action == "slash hit" || action == "thrust hit" || action == "hit") else if (action == "chop hit" || action == "slash hit" || action == "thrust hit" || action == "hit")
{ {