Store death animation index in CreatureStats

apps/openmw/mwmechanics/character.cpp

@@ -407,37 +407,56 @@ MWWorld::ContainerStoreIterator getActiveWeapon(CreatureStats &stats, MWWorld::I
     return inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
 }
 
+void CharacterController::playDeath(float startpoint, CharacterState death)
+{
+    switch (death)
+    {
+    case CharState_SwimDeath:
+        mCurrentDeath = "swimdeath";
+        break;
+    case CharState_DeathKnockDown:
+        mCurrentDeath = "deathknockdown";
+        break;
+    case CharState_DeathKnockOut:
+        mCurrentDeath = "deathknockout";
+        break;
+    default:
+        mCurrentDeath = "death" + Ogre::StringConverter::toString(death - CharState_Death1 + 1);
+    }
+    mDeathState = death;
+
+    mPtr.getClass().getCreatureStats(mPtr).setDeathAnimation(mDeathState - CharState_Death1);
+
+    // For dead actors, refreshCurrentAnims is no longer called, so we need to disable the movement state manually.
+    mMovementState = CharState_None;
+    mAnimation->disable(mCurrentMovement);
+    mCurrentMovement = "";
+
+    mAnimation->play(mCurrentDeath, Priority_Death, MWRender::Animation::Group_All,
+                    false, 1.0f, "start", "stop", startpoint, 0);
+}
+
 void CharacterController::playRandomDeath(float startpoint)
 {
     if(MWBase::Environment::get().getWorld()->isSwimming(mPtr) && mAnimation->hasAnimation("swimdeath"))
     {
         mDeathState = CharState_SwimDeath;
-        mCurrentDeath = "swimdeath";
     }
     else if (mHitState == CharState_KnockDown)
     {
         mDeathState = CharState_DeathKnockDown;
-        mCurrentDeath = "deathknockdown";
     }
     else if (mHitState == CharState_KnockOut)
     {
         mDeathState = CharState_DeathKnockOut;
-        mCurrentDeath = "deathknockout";
     }
     else
     {
         int selected=0;
-        mCurrentDeath = chooseRandomGroup("death", &selected);
+        chooseRandomGroup("death", &selected);
         mDeathState = static_cast<CharacterState>(CharState_Death1 + (selected-1));
     }
-
-    // For dead actors, refreshCurrentAnims is no longer called, so we need to disable the movement state manually.
-    mMovementState = CharState_None;
-    mAnimation->disable(mCurrentMovement);
-    mCurrentMovement = "";
-
-    mAnimation->play(mCurrentDeath, Priority_Death, MWRender::Animation::Group_All,
-                    false, 1.0f, "start", "stop", startpoint, 0);
+    playDeath(startpoint, mDeathState);
 }
 
 CharacterController::CharacterController(const MWWorld::Ptr &ptr, MWRender::Animation *anim)
@@ -497,7 +516,8 @@ CharacterController::CharacterController(const MWWorld::Ptr &ptr, MWRender::Anim
 
     if(mDeathState != CharState_None)
     {
-        playRandomDeath(1.0f);
+        int deathindex = mPtr.getClass().getCreatureStats(mPtr).getDeathAnimation();
+        playDeath(1.0f, CharacterState(CharState_Death1 + deathindex));
     }
     else
         refreshCurrentAnims(mIdleState, mMovementState, true);

apps/openmw/mwmechanics/character.hpp

@@ -181,6 +181,7 @@ class CharacterController
 
     void updateVisibility();
 
+    void playDeath(float startpoint, CharacterState death);
     void playRandomDeath(float startpoint = 0.0f);
 
     /// choose a random animation group with \a prefix and numeric suffix

apps/openmw/mwmechanics/creaturestats.cpp

@@ -22,7 +22,8 @@ namespace MWMechanics
           mFallHeight(0), mRecalcDynamicStats(false), mKnockdown(false), mKnockdownOneFrame(false),
           mKnockdownOverOneFrame(false), mHitRecovery(false), mBlock(false),
           mMovementFlags(0), mDrawState (DrawState_Nothing), mAttackStrength(0.f),
-          mLastRestock(0,0), mGoldPool(0), mActorId(-1)
+          mLastRestock(0,0), mGoldPool(0), mActorId(-1),
+          mDeathAnimation(0)
     {
         for (int i=0; i<4; ++i)
             mAiSettings[i] = 0;
@@ -498,6 +499,7 @@ namespace MWMechanics
         state.mDrawState = mDrawState;
         state.mLevel = mLevel;
         state.mActorId = mActorId;
+        state.mDeathAnimation = mDeathAnimation;
 
         mSpells.writeState(state.mSpells);
         mActiveSpells.writeState(state.mActiveSpells);
@@ -537,6 +539,7 @@ namespace MWMechanics
         mDrawState = DrawState_(state.mDrawState);
         mLevel = state.mLevel;
         mActorId = state.mActorId;
+        mDeathAnimation = state.mDeathAnimation;
 
         mSpells.readState(state.mSpells);
         mActiveSpells.readState(state.mActiveSpells);
@@ -590,4 +593,14 @@ namespace MWMechanics
     {
         esm.getHNT(sActorId, "COUN");
     }
+
+    unsigned char CreatureStats::getDeathAnimation() const
+    {
+        return mDeathAnimation;
+    }
+
+    void CreatureStats::setDeathAnimation(unsigned char index)
+    {
+        mDeathAnimation = index;
+    }
 }

apps/openmw/mwmechanics/creaturestats.hpp

@@ -64,6 +64,9 @@ namespace MWMechanics
 
         int mActorId;
 
+        // The index of the death animation that was played
+        unsigned char mDeathAnimation;
+
     protected:
         // These two are only set by NpcStats, but they are declared in CreatureStats to prevent using virtual methods.
         bool mIsWerewolf;
@@ -250,6 +253,9 @@ namespace MWMechanics
         void setGoldPool(int pool);
         int getGoldPool() const;
 
+        unsigned char getDeathAnimation() const;
+        void setDeathAnimation(unsigned char index);
+
         int getActorId();
         ///< Will generate an actor ID, if the actor does not have one yet.
 

components/esm/creaturestats.cpp

@@ -74,6 +74,9 @@ void ESM::CreatureStats::load (ESMReader &esm)
     mActorId = -1;
     esm.getHNOT (mActorId, "ACID");
 
+    mDeathAnimation = 0;
+    esm.getHNOT (mDeathAnimation, "DANM");
+
     mSpells.load(esm);
     mActiveSpells.load(esm);
 }
@@ -152,6 +155,9 @@ void ESM::CreatureStats::save (ESMWriter &esm) const
     if (mActorId != -1)
         esm.writeHNT ("ACID", mActorId);
 
+    if (mDeathAnimation)
+        esm.writeHNT ("DANM", mDeathAnimation);
+
     mSpells.save(esm);
     mActiveSpells.save(esm);
 }

components/esm/creaturestats.hpp

@@ -46,6 +46,7 @@ namespace ESM
         std::string mLastHitObject;
         bool mRecalcDynamicStats;
         int mDrawState;
+        unsigned char mDeathAnimation;
 
         int mLevel;