teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

[General] Minor cleanup of the Actor Packets

Browse source
This commit is contained in:
Koncord 2017-11-28 21:51:34 +08:00
parent e44fcdc0b3
commit 744b8cf168
7 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/openmw-mp/Controllers/ActorPacketController.cpp
View file

@ -43,7 +43,7 @@ mwmp::ActorPacketController::ActorPacketController(RakNet::RakPeerInterface *pee
mwmp::ActorPacket *mwmp::ActorPacketController::GetPacket(RakNet::MessageID id) mwmp::ActorPacket *mwmp::ActorPacketController::GetPacket(RakNet::MessageID id)
{ {
return packets[(unsigned char)id].get(); return packets[(RakNet::MessageID)id].get();
} }
void mwmp::ActorPacketController::SetStream(RakNet::BitStream *inStream, RakNet::BitStream *outStream) void mwmp::ActorPacketController::SetStream(RakNet::BitStream *inStream, RakNet::BitStream *outStream)

2
components/openmw-mp/Controllers/ActorPacketController.hpp
View file

@ -18,7 +18,7 @@ namespace mwmp
bool ContainsPacket(RakNet::MessageID id); bool ContainsPacket(RakNet::MessageID id);
typedef std::unordered_map<unsigned char, std::unique_ptr<ActorPacket> > packets_t; typedef std::unordered_map<RakNet::MessageID, std::unique_ptr<ActorPacket> > packets_t;
private: private:
packets_t packets; packets_t packets;
}; };

4
components/openmw-mp/Packets/Actor/ActorPacket.cpp
View file

@ -53,8 +53,8 @@ bool ActorPacket::PacketHeader(RakNet::BitStream *bs, bool send)
{ {
BasePacket::Packet(bs, send); BasePacket::Packet(bs, send);
RW(actorList->cell.mData, send, 1); RW(actorList->cell.mData, send, true);
RW(actorList->cell.mName, send, 1); RW(actorList->cell.mName, send, true);
if (send) if (send)
actorList->count = (unsigned int)(actorList->baseActors.size()); actorList->count = (unsigned int)(actorList->baseActors.size());

4
components/openmw-mp/Packets/Actor/PacketActorAuthority.cpp
View file

@ -12,6 +12,6 @@ void PacketActorAuthority::Packet(RakNet::BitStream *bs, bool send)
{ {
BasePacket::Packet(bs, send); BasePacket::Packet(bs, send);
RW(actorList->cell.mData, send, 1); RW(actorList->cell.mData, send, true);
RW(actorList->cell.mName, send, 1); RW(actorList->cell.mName, send, true);
} }

8
components/openmw-mp/Packets/Actor/PacketActorCellChange.cpp
View file

@ -11,9 +11,9 @@ PacketActorCellChange::PacketActorCellChange(RakNet::RakPeerInterface *peer) : A
void PacketActorCellChange::Actor(BaseActor &actor, bool send) void PacketActorCellChange::Actor(BaseActor &actor, bool send)
{ {
RW(actor.cell.mData, send, 1); RW(actor.cell.mData, send, true);
RW(actor.cell.mName, send, 1); RW(actor.cell.mName, send, true);
RW(actor.position, send, 1); RW(actor.position, send, true);
RW(actor.direction, send, 1); RW(actor.direction, send, true);
} }

8
components/openmw-mp/Packets/Actor/PacketActorEquipment.cpp
View file

@ -11,10 +11,10 @@ PacketActorEquipment::PacketActorEquipment(RakNet::RakPeerInterface *peer) : Act
void PacketActorEquipment::Actor(BaseActor &actor, bool send) void PacketActorEquipment::Actor(BaseActor &actor, bool send)
{ {
for (int j = 0; j < 19; j++) for (auto &&equipedItem : actor.equipedItems)
{ {
RW(actor.equipedItems[j].refId, send); RW(equipedItem.refId, send);
RW(actor.equipedItems[j].count, send); RW(equipedItem.count, send);
RW(actor.equipedItems[j].charge, send); RW(equipedItem.charge, send);
} }
} }

4
components/openmw-mp/Packets/Actor/PacketActorPosition.cpp
View file

@ -11,8 +11,8 @@ PacketActorPosition::PacketActorPosition(RakNet::RakPeerInterface *peer) : Actor
void PacketActorPosition::Actor(BaseActor &actor, bool send) void PacketActorPosition::Actor(BaseActor &actor, bool send)
{ {
RW(actor.position, send, 1); RW(actor.position, send, true);
RW(actor.direction, send, 1); RW(actor.direction, send, true);
actor.hasPositionData = true; actor.hasPositionData = true;
} }