mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-04-02 01:36:41 +00:00
Code Issues Releases Wiki Activity

[Client] Don't play death animations for NPCs saved as dead on server

Browse source
This commit is contained in:
David Cernat 2017-05-14 10:27:43 +03:00
parent da22639620
commit 271594f0ee
2 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
apps/openmw/mwmechanics/character.cpp
View file

@ -683,6 +683,20 @@ CharacterState CharacterController::chooseRandomDeathState() const
void CharacterController::playRandomDeath(float startpoint) void CharacterController::playRandomDeath(float startpoint)
{ {
/*
Start of tes3mp addition
If this is a LocalActor or DedicatedActor whose death animation is supposed to be finished,
set the start point to the animation's end
*/
if (mPtr.getClass().getCreatureStats(mPtr).isDeathAnimationFinished() && (mwmp::Main::get().getCellController()->isLocalActor(mPtr) || mwmp::Main::get().getCellController()->isDedicatedActor(mPtr)))
{
startpoint = 1.F;
}
/*
End of tes3mp addition
*/
if (mPtr == getPlayer()) if (mPtr == getPlayer())
{ {
// The first-person animations do not include death, so we need to // The first-person animations do not include death, so we need to

3
apps/openmw/mwmp/Cell.cpp
View file

@ -188,6 +188,9 @@ void Cell::readStatsDynamic(ActorList& actorList)
// That way, if this actor is about to become a LocalActor, initial data about it // That way, if this actor is about to become a LocalActor, initial data about it
// received from the server still gets set // received from the server still gets set
actor->setStatsDynamic(); actor->setStatsDynamic();
if (actor->creatureStats.mDynamic[0].mCurrent < 1)
actor->getPtr().getClass().getCreatureStats(actor->getPtr()).setDeathAnimationFinished(true);
} }
} }
} }