From 1a699329e57d53e27a3ff04ebac37768196a991e Mon Sep 17 00:00:00 2001 From: David Cernat Date: Mon, 1 May 2017 20:18:22 +0300 Subject: [PATCH] [General] Set new BaseActor booleans in corresponding packets --- components/openmw-mp/Base/BaseActor.hpp | 3 ++- components/openmw-mp/Packets/Actor/PacketActorPosition.cpp | 2 ++ components/openmw-mp/Packets/Actor/PacketActorStatsDynamic.cpp | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/components/openmw-mp/Base/BaseActor.hpp b/components/openmw-mp/Base/BaseActor.hpp index b508ee201..0666b54e7 100644 --- a/components/openmw-mp/Base/BaseActor.hpp +++ b/components/openmw-mp/Base/BaseActor.hpp @@ -15,7 +15,8 @@ namespace mwmp BaseActor() { - + hasPositionData = false; + hasStatsDynamicData = false; } std::string refId; diff --git a/components/openmw-mp/Packets/Actor/PacketActorPosition.cpp b/components/openmw-mp/Packets/Actor/PacketActorPosition.cpp index a7ef0f3db..c4342b13f 100644 --- a/components/openmw-mp/Packets/Actor/PacketActorPosition.cpp +++ b/components/openmw-mp/Packets/Actor/PacketActorPosition.cpp @@ -41,6 +41,8 @@ void PacketActorPosition::Packet(RakNet::BitStream *bs, bool send) RW(actor.position, send); RW(actor.direction, send); + actor.hasPositionData = true; + if (!send) { actorList->baseActors.push_back(actor); diff --git a/components/openmw-mp/Packets/Actor/PacketActorStatsDynamic.cpp b/components/openmw-mp/Packets/Actor/PacketActorStatsDynamic.cpp index 4f2628487..5d4c89584 100644 --- a/components/openmw-mp/Packets/Actor/PacketActorStatsDynamic.cpp +++ b/components/openmw-mp/Packets/Actor/PacketActorStatsDynamic.cpp @@ -43,6 +43,8 @@ void PacketActorStatsDynamic::Packet(RakNet::BitStream *bs, bool send) RW(actor.creatureStats.mDynamic[1], send); // magic RW(actor.creatureStats.mDynamic[2], send); // fatigue + actor.hasStatsDynamicData = true; + if (!send) { actorList->baseActors.push_back(actor);