Merge branch 'equipunequipwhatsthedifference' into 'master'

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

Closes #7886

See merge request OpenMW/openmw!3951

CHANGELOG.md

@@ -162,6 +162,7 @@
     Bug #7859: AutoCalc flag is not used to calculate potion value
     Bug #7861: OpenMW-CS: Incorrect DIAL's type in INFO records
     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 #7898: Editor: Invalid reference scales are allowed
     Bug #7899: Editor: Doors can't be unlocked

apps/openmw/mwmechanics/character.cpp

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