From 0d53a6916dfd5ea65ec134714e6e813b202f7477 Mon Sep 17 00:00:00 2001
From: Koncord <stas5978@gmail.com>
Date: Sun, 5 Mar 2017 16:01:42 +0800
Subject: [PATCH] [General] Move repeated code in Packet() to base class

---
 components/openmw-mp/Packets/BasePacket.cpp          | 11 +++++++++++
 components/openmw-mp/Packets/BasePacket.hpp          |  3 ++-
 components/openmw-mp/Packets/Player/PlayerPacket.cpp |  8 +-------
 components/openmw-mp/Packets/World/WorldPacket.cpp   |  8 +-------
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/components/openmw-mp/Packets/BasePacket.cpp b/components/openmw-mp/Packets/BasePacket.cpp
index 4ccb2e71b..8699f3ef3 100644
--- a/components/openmw-mp/Packets/BasePacket.cpp
+++ b/components/openmw-mp/Packets/BasePacket.cpp
@@ -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)
 {
     bsRead = bitStream;
diff --git a/components/openmw-mp/Packets/BasePacket.hpp b/components/openmw-mp/Packets/BasePacket.hpp
index a9d1dce3e..244a273ee 100644
--- a/components/openmw-mp/Packets/BasePacket.hpp
+++ b/components/openmw-mp/Packets/BasePacket.hpp
@@ -5,7 +5,6 @@
 #include <RakNetTypes.h>
 #include <BitStream.h>
 #include <PacketPriority.h>
-#include <components/openmw-mp/Base/BasePlayer.hpp>
 
 
 namespace mwmp
@@ -17,6 +16,8 @@ namespace mwmp
 
         ~BasePacket();
 
+        virtual void Packet(RakNet::BitStream *bs, RakNet::RakNetGUID &guid, bool send);
+
         void SetReadStream(RakNet::BitStream *bitStream);
         void SetSendStream(RakNet::BitStream *bitStream);
         void SetStreams(RakNet::BitStream *inStream, RakNet::BitStream *outStream);
diff --git a/components/openmw-mp/Packets/Player/PlayerPacket.cpp b/components/openmw-mp/Packets/Player/PlayerPacket.cpp
index 32569f02a..99bc15183 100644
--- a/components/openmw-mp/Packets/Player/PlayerPacket.cpp
+++ b/components/openmw-mp/Packets/Player/PlayerPacket.cpp
@@ -7,14 +7,8 @@ using namespace mwmp;
 
 void PlayerPacket::Packet(RakNet::BitStream *bs, BasePlayer *player, bool send)
 {
+    BasePacket::Packet(bs, player->guid, send);
     this->player = player;
-    this->bs = bs;
-
-    if (send)
-    {
-        bs->Write(packetID);
-        bs->Write(player->guid);
-    }
 }
 
 PlayerPacket::PlayerPacket(RakNet::RakPeerInterface *peer) : BasePacket(peer)
diff --git a/components/openmw-mp/Packets/World/WorldPacket.cpp b/components/openmw-mp/Packets/World/WorldPacket.cpp
index 051b41d7d..7a013f59c 100644
--- a/components/openmw-mp/Packets/World/WorldPacket.cpp
+++ b/components/openmw-mp/Packets/World/WorldPacket.cpp
@@ -7,14 +7,8 @@ using namespace mwmp;
 
 void WorldPacket::Packet(RakNet::BitStream *bs, BaseEvent *event, bool send)
 {
+    BasePacket::Packet(bs, event->guid, send);
     this->event = event;
-    this->bs = bs;
-
-    if (send)
-    {
-        bs->Write(packetID);
-        bs->Write(event->guid);
-    }
 }
 
 WorldPacket::WorldPacket(RakNet::RakPeerInterface *peer) : BasePacket(peer)