[General] Synchronize death animations for players

apps/openmw/mwmechanics/character.cpp

@@ -37,6 +37,7 @@
 #include "../mwmp/LocalPlayer.hpp"
 #include "../mwmp/LocalActor.hpp"
 #include "../mwmp/PlayerList.hpp"
+#include "../mwmp/DedicatedPlayer.hpp"
 #include "../mwmp/CellController.hpp"
 #include "../mwmp/MechanicsHelper.hpp"
 /*
@@ -792,7 +793,8 @@ void CharacterController::playRandomDeath(float startpoint)
         If this is a LocalActor or DedicatedActor whose death animation is supposed to be finished,
         set the startpoint to the animation's end
     */
-    if (mPtr.getClass().getCreatureStats(mPtr).isDeathAnimationFinished() && (mwmp::Main::get().getCellController()->isLocalActor(mPtr) || mwmp::Main::get().getCellController()->isDedicatedActor(mPtr)))
+    if (mPtr.getClass().getCreatureStats(mPtr).isDeathAnimationFinished() &&
+        (mwmp::Main::get().getCellController()->isLocalActor(mPtr) || mwmp::Main::get().getCellController()->isDedicatedActor(mPtr)))
     {
         startpoint = 1.F;
     }
@@ -807,7 +809,19 @@ void CharacterController::playRandomDeath(float startpoint)
         MWBase::Environment::get().getWorld()->useDeathCamera();
     }
 
-    if(mHitState == CharState_SwimKnockDown && mAnimation->hasAnimation("swimdeathknockdown"))
+    /*
+        Start tes3mp change (major)
+
+        If this is a DedicatedPlayer, use the deathState received from their PlayerDeath packet
+    */
+    if (mwmp::PlayerList::isDedicatedPlayer(mPtr))
+    {
+        mDeathState = static_cast<CharacterState>(mwmp::PlayerList::getPlayer(mPtr)->deathState);
+    }
+    else if(mHitState == CharState_SwimKnockDown && mAnimation->hasAnimation("swimdeathknockdown"))
+    /*
+        End of tes3mp change (major)
+    */
     {
         mDeathState = CharState_SwimDeathKnockDown;
     }
@@ -832,6 +846,19 @@ void CharacterController::playRandomDeath(float startpoint)
         mDeathState = chooseRandomDeathState();
     }
 
+    /*
+        Start of tes3mp addition
+
+        Send a PlayerDeath packet with the decided-upon death animation
+    */
+    if (mPtr == getPlayer())
+    {
+        mwmp::Main::get().getLocalPlayer()->sendDeath(mDeathState);
+    }
+    /*
+        End of tes3mp addition
+    */
+
     // Do not interrupt scripted animation by death
     if (isPersistentAnimPlaying())
         return;

apps/openmw/mwmp/LocalPlayer.cpp

@@ -256,22 +256,6 @@ void LocalPlayer::updateStatsDynamic(bool forceUpdate)
         exchangeFullInfo = false;
         getNetworking()->getPlayerPacket(ID_PLAYER_STATS_DYNAMIC)->setPlayer(this);
         getNetworking()->getPlayerPacket(ID_PLAYER_STATS_DYNAMIC)->Send();
-
-        static bool wasDead = false;
-
-        if (creatureStats.mDead && !wasDead)
-        {
-            if (MechanicsHelper::isEmptyTarget(killer))
-                killer = MechanicsHelper::getTarget(getPlayerPtr());
-
-            LOG_MESSAGE_SIMPLE(TimedLog::LOG_INFO, "Sending ID_PLAYER_DEATH about myself to server");
-            getNetworking()->getPlayerPacket(ID_PLAYER_DEATH)->setPlayer(this);
-            getNetworking()->getPlayerPacket(ID_PLAYER_DEATH)->Send();
-
-            MechanicsHelper::clearTarget(killer);
-        }
-
-        wasDead = creatureStats.mDead;
     }
 }
 
@@ -1361,6 +1345,20 @@ void LocalPlayer::setSelectedSpell()
         int(MWMechanics::getSpellSuccessChance(selectedSpellId, ptrPlayer)));
 }
 
+void LocalPlayer::sendDeath(char deathState)
+{
+    if (MechanicsHelper::isEmptyTarget(killer))
+        killer = MechanicsHelper::getTarget(getPlayerPtr());
+
+    this->deathState = deathState;
+
+    LOG_MESSAGE_SIMPLE(TimedLog::LOG_INFO, "Sending ID_PLAYER_DEATH about myself to server\n- deathState: %d", deathState);
+    getNetworking()->getPlayerPacket(ID_PLAYER_DEATH)->setPlayer(this);
+    getNetworking()->getPlayerPacket(ID_PLAYER_DEATH)->Send();
+
+    MechanicsHelper::clearTarget(killer);
+}
+
 void LocalPlayer::sendClass()
 {
     MWBase::World *world = MWBase::Environment::get().getWorld();

apps/openmw/mwmp/LocalPlayer.hpp

@@ -75,6 +75,7 @@ namespace mwmp
         void setMarkLocation();
         void setSelectedSpell();
 
+        void sendDeath(char deathState);
         void sendClass();
         void sendInventory();
         void sendItemChange(const mwmp::Item& item, unsigned int action);

apps/openmw/mwmp/processors/player/ProcessorPlayerDeath.hpp

@@ -12,7 +12,6 @@ namespace mwmp
         ProcessorPlayerDeath()
         {
             BPP_INIT(ID_PLAYER_DEATH)
-            avoidReading = true;
         }
 
         virtual void Do(PlayerPacket &packet, BasePlayer *player)

components/openmw-mp/Base/BasePlayer.hpp

@@ -252,6 +252,7 @@ namespace mwmp
 
         std::string sound;
         Animation animation;
+        char deathState;
 
         bool resetStats;
         float scale;

components/openmw-mp/Packets/Player/PacketPlayerDeath.cpp

@@ -12,6 +12,7 @@ void PacketPlayerDeath::Packet(RakNet::BitStream *bs, bool send)
 {
     PlayerPacket::Packet(bs, send);
 
+    RW(player->deathState, send);
     RW(player->killer.isPlayer, send);
 
     if (player->killer.isPlayer)