Move RequestData() method to BasePacket

components/openmw-mp/Packets/BasePacket.cpp

@@ -34,4 +34,12 @@ void BasePacket::SetStreams(RakNet::BitStream *inStream, RakNet::BitStream *outS
         bsRead = inStream;
     if (outStream != 0)
         bsSend = outStream;
-}
+}
+
+void BasePacket::RequestData(RakNet::RakNetGUID guid)
+{
+    bsSend->ResetWritePointer();
+    bsSend->Write(packetID);
+    bsSend->Write(guid);
+    peer->Send(bsSend, HIGH_PRIORITY, RELIABLE_ORDERED, 0, guid, false);
+}

components/openmw-mp/Packets/BasePacket.hpp

@@ -20,6 +20,7 @@ namespace mwmp
         void SetReadStream(RakNet::BitStream *bitStream);
         void SetSendStream(RakNet::BitStream *bitStream);
         void SetStreams(RakNet::BitStream *inStream, RakNet::BitStream *outStream);
+        virtual void RequestData(RakNet::RakNetGUID guid);
 
         static size_t headerSize()
         {
@@ -65,7 +66,6 @@ namespace mwmp
             }
         }
 
-
         void RW(std::string &str, bool write)
         {
             if (write)

components/openmw-mp/Packets/Player/PlayerPacket.cpp

@@ -48,11 +48,3 @@ void PlayerPacket::Read(BasePlayer *player)
 {
     Packet(bsRead, player, false);
 }
-
-void PlayerPacket::RequestData(RakNet::RakNetGUID guid)
-{
-    bsSend->ResetWritePointer();
-    bsSend->Write(packetID);
-    bsSend->Write(guid);
-    peer->Send(bsSend, HIGH_PRIORITY, RELIABLE_ORDERED, 0, guid, false);
-}

components/openmw-mp/Packets/Player/PlayerPacket.hpp

@@ -25,8 +25,6 @@ namespace mwmp
         virtual void Send(BasePlayer *player, RakNet::AddressOrGUID destination);
         virtual void Read(BasePlayer *player);
 
-        virtual void RequestData(RakNet::RakNetGUID guid);
-
         static size_t headerSize()
         {
             return (size_t)(1 + RakNet::RakNetGUID::size()); // packetID + RakNetGUID (uint64_t)

components/openmw-mp/Packets/World/WorldPacket.cpp

@@ -48,11 +48,3 @@ void WorldPacket::Read(WorldEvent *event)
 {
     Packet(bsRead, event, false);
 }
-
-void WorldPacket::RequestData(RakNet::RakNetGUID guid)
-{
-    bsSend->ResetWritePointer();
-    bsSend->Write(packetID);
-    bsSend->Write(guid);
-    peer->Send(bsSend, HIGH_PRIORITY, RELIABLE_ORDERED, 0, guid, false);
-}

components/openmw-mp/Packets/World/WorldPacket.hpp

@@ -25,8 +25,6 @@ namespace mwmp
         virtual void Send(WorldEvent *event, RakNet::AddressOrGUID destination);
         virtual void Read(WorldEvent *event);
 
-        virtual void RequestData(RakNet::RakNetGUID guid);
-
         static size_t headerSize()
         {
             return (size_t)(1 + RakNet::RakNetGUID::size()); // packetID + RakNetGUID (uint64_t)