add packet for merging player state back to client

[blank.git] / src / net / Packet.hpp

diff --git a/src/net/Packet.hpp b/src/net/Packet.hpp
index bb6140d5952cef743c69fe4d2ff3365123491d7b..c4a8ae350299ff111abfcd47cf5228e09679eb9e 100644 (file)
--- a/src/net/Packet.hpp
+++ b/src/net/Packet.hpp
@@ -10,6 +10,7 @@
 namespace blank {
 
 class Entity;
+class EntityState;
 
 struct Packet {
 
@@ -53,6 +54,10 @@ struct Packet {
                std::size_t length;
                std::uint8_t *data;
 
+               std::uint16_t Seq() const noexcept {
+                       return reinterpret_cast<const Packet *>(data - sizeof(Header))->header.ctrl.seq;
+               }
+
                template<class T>
                void Write(const T &, size_t off) noexcept;
                template<class T>
@@ -81,7 +86,7 @@ struct Packet {
 
                void WritePlayer(const Entity &) noexcept;
                void ReadPlayerID(std::uint32_t &) const noexcept;
-               void ReadPlayer(Entity &) const noexcept;
+               void ReadPlayerState(EntityState &) const noexcept;
                void WriteWorldName(const std::string &) noexcept;
                void ReadWorldName(std::string &) const noexcept;
        };
@@ -96,15 +101,16 @@ struct Packet {
                static constexpr std::size_t MAX_LEN = 64;
 
                void WritePlayer(const Entity &) noexcept;
-               void ReadPlayer(Entity &) const noexcept;
+               void ReadPlayerState(EntityState &) const noexcept;
        };
 
        struct SpawnEntity : public Payload {
                static constexpr std::uint8_t TYPE = 5;
-               static constexpr std::size_t MAX_LEN = 128;
+               static constexpr std::size_t MAX_LEN = 132;
 
                void WriteEntity(const Entity &) noexcept;
                void ReadEntityID(std::uint32_t &) const noexcept;
+               void ReadSkeletonID(std::uint32_t &) const noexcept;
                void ReadEntity(Entity &) const noexcept;
        };
 
@@ -130,7 +136,17 @@ struct Packet {
 
                void WriteEntity(const Entity &, std::uint32_t) noexcept;
                void ReadEntityID(std::uint32_t &, std::uint32_t) const noexcept;
-               void ReadEntity(Entity &, std::uint32_t) const noexcept;
+               void ReadEntityState(EntityState &, std::uint32_t) const noexcept;
+       };
+
+       struct PlayerCorrection : public Payload {
+               static constexpr std::uint8_t TYPE = 8;
+               static constexpr std::size_t MAX_LEN = 66;
+
+               void WritePacketSeq(std::uint16_t) noexcept;
+               void ReadPacketSeq(std::uint16_t &) const noexcept;
+               void WritePlayer(const Entity &) noexcept;
+               void ReadPlayerState(EntityState &) const noexcept;
        };