From 8478fed98af4a54bf2db4315898f93135b8e9563 Mon Sep 17 00:00:00 2001 From: Koncord Date: Sun, 28 May 2017 15:23:16 +0800 Subject: [PATCH] [General] Simplify Actor packets. --- components/openmw-mp/Packets/Actor/ActorPacket.cpp | 8 ++++++++ components/openmw-mp/Packets/Actor/ActorPacket.hpp | 1 + .../openmw-mp/Packets/Actor/PacketActorAnimFlags.cpp | 6 +----- .../openmw-mp/Packets/Actor/PacketActorAnimPlay.cpp | 5 ----- components/openmw-mp/Packets/Actor/PacketActorAttack.cpp | 5 ----- .../openmw-mp/Packets/Actor/PacketActorAuthority.cpp | 5 ----- .../openmw-mp/Packets/Actor/PacketActorCellChange.cpp | 5 ----- .../openmw-mp/Packets/Actor/PacketActorEquipment.cpp | 5 ----- components/openmw-mp/Packets/Actor/PacketActorList.cpp | 5 ----- .../openmw-mp/Packets/Actor/PacketActorPosition.cpp | 3 --- components/openmw-mp/Packets/Actor/PacketActorSpeech.cpp | 5 ----- .../openmw-mp/Packets/Actor/PacketActorStatsDynamic.cpp | 5 ----- components/openmw-mp/Packets/Actor/PacketActorTest.cpp | 5 ----- 13 files changed, 10 insertions(+), 53 deletions(-) diff --git a/components/openmw-mp/Packets/Actor/ActorPacket.cpp b/components/openmw-mp/Packets/Actor/ActorPacket.cpp index 3496101dc..52a31e3dd 100644 --- a/components/openmw-mp/Packets/Actor/ActorPacket.cpp +++ b/components/openmw-mp/Packets/Actor/ActorPacket.cpp @@ -24,3 +24,11 @@ void ActorPacket::setActorList(BaseActorList *actorList) this->actorList = actorList; guid = actorList->guid; } + +void ActorPacket::Packet(RakNet::BitStream *bs, bool send) +{ + BasePacket::Packet(bs, send); + + RW(actorList->cell.mData, send, 1); + RW(actorList->cell.mName, send, 1); +} diff --git a/components/openmw-mp/Packets/Actor/ActorPacket.hpp b/components/openmw-mp/Packets/Actor/ActorPacket.hpp index 9fd2c6508..0caae13aa 100644 --- a/components/openmw-mp/Packets/Actor/ActorPacket.hpp +++ b/components/openmw-mp/Packets/Actor/ActorPacket.hpp @@ -20,6 +20,7 @@ namespace mwmp ~ActorPacket(); void setActorList(BaseActorList *actorList); + virtual void Packet(RakNet::BitStream *bs, bool send); protected: BaseActorList *actorList; diff --git a/components/openmw-mp/Packets/Actor/PacketActorAnimFlags.cpp b/components/openmw-mp/Packets/Actor/PacketActorAnimFlags.cpp index 34c084d1d..a11b10dd4 100644 --- a/components/openmw-mp/Packets/Actor/PacketActorAnimFlags.cpp +++ b/components/openmw-mp/Packets/Actor/PacketActorAnimFlags.cpp @@ -20,11 +20,6 @@ void PacketActorAnimFlags::Packet(RakNet::BitStream *bs, bool send) RW(actorList->count, send); - RW(actorList->cell.mData.mFlags, send); - RW(actorList->cell.mData.mX, send); - RW(actorList->cell.mData.mY, send); - RW(actorList->cell.mName, send); - BaseActor actor; for (unsigned int i = 0; i < actorList->count; i++) @@ -46,4 +41,5 @@ void PacketActorAnimFlags::Packet(RakNet::BitStream *bs, bool send) actorList->baseActors.push_back(actor); } } + printf("Packet size: %d\n", bs->GetNumberOfBytesUsed()); } diff --git a/components/openmw-mp/Packets/Actor/PacketActorAnimPlay.cpp b/components/openmw-mp/Packets/Actor/PacketActorAnimPlay.cpp index 325a89295..37b681c3f 100644 --- a/components/openmw-mp/Packets/Actor/PacketActorAnimPlay.cpp +++ b/components/openmw-mp/Packets/Actor/PacketActorAnimPlay.cpp @@ -20,11 +20,6 @@ void PacketActorAnimPlay::Packet(RakNet::BitStream *bs, bool send) RW(actorList->count, send); - RW(actorList->cell.mData.mFlags, send); - RW(actorList->cell.mData.mX, send); - RW(actorList->cell.mData.mY, send); - RW(actorList->cell.mName, send); - BaseActor actor; for (unsigned int i = 0; i < actorList->count; i++) diff --git a/components/openmw-mp/Packets/Actor/PacketActorAttack.cpp b/components/openmw-mp/Packets/Actor/PacketActorAttack.cpp index af4364eb2..8f9606302 100644 --- a/components/openmw-mp/Packets/Actor/PacketActorAttack.cpp +++ b/components/openmw-mp/Packets/Actor/PacketActorAttack.cpp @@ -20,11 +20,6 @@ void PacketActorAttack::Packet(RakNet::BitStream *bs, bool send) RW(actorList->count, send); - RW(actorList->cell.mData.mFlags, send); - RW(actorList->cell.mData.mX, send); - RW(actorList->cell.mData.mY, send); - RW(actorList->cell.mName, send); - BaseActor actor; for (unsigned int i = 0; i < actorList->count; i++) diff --git a/components/openmw-mp/Packets/Actor/PacketActorAuthority.cpp b/components/openmw-mp/Packets/Actor/PacketActorAuthority.cpp index 17c2f10e7..07ef7ed86 100644 --- a/components/openmw-mp/Packets/Actor/PacketActorAuthority.cpp +++ b/components/openmw-mp/Packets/Actor/PacketActorAuthority.cpp @@ -18,9 +18,4 @@ void PacketActorAuthority::Packet(RakNet::BitStream *bs, bool send) actorList->baseActors.clear(); RW(actorList->count, send); - - RW(actorList->cell.mData.mFlags, send); - RW(actorList->cell.mData.mX, send); - RW(actorList->cell.mData.mY, send); - RW(actorList->cell.mName, send); } diff --git a/components/openmw-mp/Packets/Actor/PacketActorCellChange.cpp b/components/openmw-mp/Packets/Actor/PacketActorCellChange.cpp index 601de950d..4af9a4d79 100644 --- a/components/openmw-mp/Packets/Actor/PacketActorCellChange.cpp +++ b/components/openmw-mp/Packets/Actor/PacketActorCellChange.cpp @@ -37,11 +37,6 @@ void PacketActorCellChange::Packet(RakNet::BitStream *bs, bool send) RW(actor.refNumIndex, send); RW(actor.mpNum, send); - RW(actor.cell.mData.mFlags, send); - RW(actor.cell.mData.mX, send); - RW(actor.cell.mData.mY, send); - RW(actor.cell.mName, send); - RW(actor.position, send); RW(actor.direction, send); diff --git a/components/openmw-mp/Packets/Actor/PacketActorEquipment.cpp b/components/openmw-mp/Packets/Actor/PacketActorEquipment.cpp index 56570c564..ae80f2e27 100644 --- a/components/openmw-mp/Packets/Actor/PacketActorEquipment.cpp +++ b/components/openmw-mp/Packets/Actor/PacketActorEquipment.cpp @@ -20,11 +20,6 @@ void PacketActorEquipment::Packet(RakNet::BitStream *bs, bool send) RW(actorList->count, send); - RW(actorList->cell.mData.mFlags, send); - RW(actorList->cell.mData.mX, send); - RW(actorList->cell.mData.mY, send); - RW(actorList->cell.mName, send); - BaseActor actor; for (unsigned int i = 0; i < actorList->count; i++) diff --git a/components/openmw-mp/Packets/Actor/PacketActorList.cpp b/components/openmw-mp/Packets/Actor/PacketActorList.cpp index 53f022bef..55b70508d 100644 --- a/components/openmw-mp/Packets/Actor/PacketActorList.cpp +++ b/components/openmw-mp/Packets/Actor/PacketActorList.cpp @@ -27,11 +27,6 @@ void PacketActorList::Packet(RakNet::BitStream *bs, bool send) return; } - RW(actorList->cell.mData.mFlags, send); - RW(actorList->cell.mData.mX, send); - RW(actorList->cell.mData.mY, send); - RW(actorList->cell.mName, send); - BaseActor actor; for (unsigned int i = 0; i < actorList->count; i++) diff --git a/components/openmw-mp/Packets/Actor/PacketActorPosition.cpp b/components/openmw-mp/Packets/Actor/PacketActorPosition.cpp index 4e75aa38e..e6f6cfa20 100644 --- a/components/openmw-mp/Packets/Actor/PacketActorPosition.cpp +++ b/components/openmw-mp/Packets/Actor/PacketActorPosition.cpp @@ -20,9 +20,6 @@ void PacketActorPosition::Packet(RakNet::BitStream *bs, bool send) RW(actorList->count, send); - RW(actorList->cell.mData, send, 1); - RW(actorList->cell.mName, send, 1); - BaseActor actor; for (unsigned int i = 0; i < actorList->count; i++) diff --git a/components/openmw-mp/Packets/Actor/PacketActorSpeech.cpp b/components/openmw-mp/Packets/Actor/PacketActorSpeech.cpp index a77f0abff..7c7c3802e 100644 --- a/components/openmw-mp/Packets/Actor/PacketActorSpeech.cpp +++ b/components/openmw-mp/Packets/Actor/PacketActorSpeech.cpp @@ -20,11 +20,6 @@ void PacketActorSpeech::Packet(RakNet::BitStream *bs, bool send) RW(actorList->count, send); - RW(actorList->cell.mData.mFlags, send); - RW(actorList->cell.mData.mX, send); - RW(actorList->cell.mData.mY, send); - RW(actorList->cell.mName, send); - BaseActor actor; for (unsigned int i = 0; i < actorList->count; i++) diff --git a/components/openmw-mp/Packets/Actor/PacketActorStatsDynamic.cpp b/components/openmw-mp/Packets/Actor/PacketActorStatsDynamic.cpp index 56dc7c833..ef53923a0 100644 --- a/components/openmw-mp/Packets/Actor/PacketActorStatsDynamic.cpp +++ b/components/openmw-mp/Packets/Actor/PacketActorStatsDynamic.cpp @@ -21,11 +21,6 @@ void PacketActorStatsDynamic::Packet(RakNet::BitStream *bs, bool send) RW(actorList->count, send); - RW(actorList->cell.mData.mFlags, send); - RW(actorList->cell.mData.mX, send); - RW(actorList->cell.mData.mY, send); - RW(actorList->cell.mName, send); - BaseActor actor; for (unsigned int i = 0; i < actorList->count; i++) diff --git a/components/openmw-mp/Packets/Actor/PacketActorTest.cpp b/components/openmw-mp/Packets/Actor/PacketActorTest.cpp index 9fe8983e1..6920cb777 100644 --- a/components/openmw-mp/Packets/Actor/PacketActorTest.cpp +++ b/components/openmw-mp/Packets/Actor/PacketActorTest.cpp @@ -20,11 +20,6 @@ void PacketActorTest::Packet(RakNet::BitStream *bs, bool send) RW(actorList->count, send); - RW(actorList->cell.mData.mFlags, send); - RW(actorList->cell.mData.mX, send); - RW(actorList->cell.mData.mY, send); - RW(actorList->cell.mName, send); - BaseActor actor; for (unsigned int i = 0; i < actorList->count; i++)