Merge remote-tracking branch 'glorf/master'

apps/openmw/mwmechanics/character.cpp

@@ -179,6 +179,7 @@ CharacterController::CharacterController(const MWWorld::Ptr &ptr, MWRender::Anim
     , mSkipAnim(false)
     , mSecondsOfRunning(0)
     , mSecondsOfSwimming(0)
+    , mUpdateWeapon(true)
 {
     if(!mAnimation)
         return;
@@ -407,6 +408,13 @@ void CharacterController::update(float duration, Movement &movement)
             else
                 weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
 
+            if(mUpdateWeapon)
+            {
+                mWeaponType = weaptype;
+                forceStateUpdate();
+                mUpdateWeapon = false;
+            }
+
             if(weaptype != mWeaponType)
             {
                 std::string weapgroup;

apps/openmw/mwmechanics/character.hpp

@@ -104,6 +104,9 @@ class CharacterController
     WeaponType mWeaponType;
     bool mSkipAnim;
 
+    // Workaround for playing weapon draw animation and sound when going to new cell
+    bool mUpdateWeapon;
+
     // counted for skill increase
     float mSecondsOfSwimming;
     float mSecondsOfRunning;