X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fnet%2FPacket.hpp;h=4ff45df53b6e5a136310b57991087b3249d35549;hb=b5a83cd3df5083ed0cccfe4876143e788b3836f9;hp=bd9dd86436a68ff0c08c548b8dd8b2031aa06ee2;hpb=1afc887a2040dfdedfa66913e94ff7a9634f648f;p=blank.git diff --git a/src/net/Packet.hpp b/src/net/Packet.hpp index bd9dd86..4ff45df 100644 --- 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,14 @@ 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; + }; + template PayloadType As() { @@ -105,7 +122,7 @@ struct Packet { pack.Tag(); pack.Type(PayloadType::TYPE); - udp_pack.len = sizeof(Header) + PayloadType::TYPE; + udp_pack.len = sizeof(Header) + PayloadType::MAX_LEN; PayloadType result; result.length = PayloadType::MAX_LEN;