fix loop removing players from world

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

diff --git a/src/net/Packet.hpp b/src/net/Packet.hpp
index fa35189056d3201ca982539913303e3c0a19ed92..bb6140d5952cef743c69fe4d2ff3365123491d7b 100644 (file)
--- a/src/net/Packet.hpp
+++ b/src/net/Packet.hpp
@@ -21,12 +21,20 @@ struct Packet {
                std::uint16_t seq;
                std::uint16_t ack;
                std::uint32_t hist;
+
+               // true if this contains an ack for given (remote) seq
+               bool Acks(std::uint16_t) const noexcept;
+               std::uint16_t AckBegin() const noexcept { return ack; }
+               std::uint16_t AckEnd() const noexcept { return ack + std::uint16_t(33); }
        };
 
        struct Header {
                std::uint32_t tag;
                TControl ctrl;
                std::uint8_t type;
+               std::uint8_t reserved1;
+               std::uint8_t reserved2;
+               std::uint8_t reserved3;
        } header;
 
        static constexpr std::size_t MAX_PAYLOAD_LEN = 500 - sizeof(Header);
@@ -72,6 +80,7 @@ struct Packet {
                static constexpr std::size_t MAX_LEN = 100;
 
                void WritePlayer(const Entity &) noexcept;
+               void ReadPlayerID(std::uint32_t &) const noexcept;
                void ReadPlayer(Entity &) const noexcept;
                void WriteWorldName(const std::string &) noexcept;
                void ReadWorldName(std::string &) const noexcept;
@@ -82,6 +91,48 @@ struct Packet {
                static constexpr std::size_t MAX_LEN = 0;
        };
 
+       struct PlayerUpdate : public Payload {
+               static constexpr std::uint8_t TYPE = 4;
+               static constexpr std::size_t MAX_LEN = 64;
+
+               void WritePlayer(const Entity &) noexcept;
+               void ReadPlayer(Entity &) const noexcept;
+       };
+
+       struct SpawnEntity : public Payload {
+               static constexpr std::uint8_t TYPE = 5;
+               static constexpr std::size_t MAX_LEN = 128;
+
+               void WriteEntity(const Entity &) noexcept;
+               void ReadEntityID(std::uint32_t &) const noexcept;
+               void ReadEntity(Entity &) const noexcept;
+       };
+
+       struct DespawnEntity : public Payload {
+               static constexpr std::uint8_t TYPE = 6;
+               static constexpr std::size_t MAX_LEN = 4;
+
+               void WriteEntityID(std::uint32_t) noexcept;
+               void ReadEntityID(std::uint32_t &) const noexcept;
+       };
+
+       struct EntityUpdate : public Payload {
+               static constexpr std::uint8_t TYPE = 7;
+               static constexpr std::size_t MAX_LEN = 452;
+
+               static constexpr std::uint32_t MAX_ENTITIES = 7;
+               static constexpr std::size_t GetSize(std::uint32_t num) noexcept {
+                       return 4 + (num * 64);
+               }
+
+               void WriteEntityCount(std::uint32_t) noexcept;
+               void ReadEntityCount(std::uint32_t &) const noexcept;
+
+               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;
+       };
+
 
        template<class PayloadType>
        PayloadType As() {