AnarchistGamers/TES3MP
1
0
Fork 0
mirror of https://github.com/TES3MP/TES3MP.git synced 2025-09-28 15:41:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

[General] Move repeated code in Packet() to base class

Browse Source
This commit is contained in:
Koncord 2017-03-05 16:01:42 +08:00
parent df051a777a
commit 0d53a6916d
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
components/openmw-mp/Packets/BasePacket.cpp
View File

@ -18,6 +18,17 @@ BasePacket::~BasePacket()
} }
void BasePacket::Packet(RakNet::BitStream *bs, RakNet::RakNetGUID &guid, bool send)
{
this->bs = bs;
if (send)
{
bs->Write(packetID);
bs->Write(guid);
}
}
void BasePacket::SetReadStream(RakNet::BitStream *bitStream) void BasePacket::SetReadStream(RakNet::BitStream *bitStream)
{ {
bsRead = bitStream; bsRead = bitStream;

3
components/openmw-mp/Packets/BasePacket.hpp
View File

@ -5,7 +5,6 @@
#include <RakNetTypes.h> #include <RakNetTypes.h>
#include <BitStream.h> #include <BitStream.h>
#include <PacketPriority.h> #include <PacketPriority.h>
#include <components/openmw-mp/Base/BasePlayer.hpp>
namespace mwmp namespace mwmp
@ -17,6 +16,8 @@ namespace mwmp
~BasePacket(); ~BasePacket();
virtual void Packet(RakNet::BitStream *bs, RakNet::RakNetGUID &guid, bool send);
void SetReadStream(RakNet::BitStream *bitStream); void SetReadStream(RakNet::BitStream *bitStream);
void SetSendStream(RakNet::BitStream *bitStream); void SetSendStream(RakNet::BitStream *bitStream);
void SetStreams(RakNet::BitStream *inStream, RakNet::BitStream *outStream); void SetStreams(RakNet::BitStream *inStream, RakNet::BitStream *outStream);

8
components/openmw-mp/Packets/Player/PlayerPacket.cpp
View File

@ -7,14 +7,8 @@ using namespace mwmp;
void PlayerPacket::Packet(RakNet::BitStream *bs, BasePlayer *player, bool send) void PlayerPacket::Packet(RakNet::BitStream *bs, BasePlayer *player, bool send)
{ {
BasePacket::Packet(bs, player->guid, send);
this->player = player; this->player = player;
this->bs = bs;
if (send)
{
bs->Write(packetID);
bs->Write(player->guid);
}
} }
PlayerPacket::PlayerPacket(RakNet::RakPeerInterface *peer) : BasePacket(peer) PlayerPacket::PlayerPacket(RakNet::RakPeerInterface *peer) : BasePacket(peer)

8
components/openmw-mp/Packets/World/WorldPacket.cpp
View File

@ -7,14 +7,8 @@ using namespace mwmp;
void WorldPacket::Packet(RakNet::BitStream *bs, BaseEvent *event, bool send) void WorldPacket::Packet(RakNet::BitStream *bs, BaseEvent *event, bool send)
{ {
BasePacket::Packet(bs, event->guid, send);
this->event = event; this->event = event;
this->bs = bs;
if (send)
{
bs->Write(packetID);
bs->Write(event->guid);
}
} }
WorldPacket::WorldPacket(RakNet::RakPeerInterface *peer) : BasePacket(peer) WorldPacket::WorldPacket(RakNet::RakPeerInterface *peer) : BasePacket(peer)