X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fnet%2FPacket.hpp;h=4742a4525d679a44333c2d27b7eb88a306793cdc;hb=d2eb51ad9759eeee743b04aee6f1ae69132fc706;hp=bd9dd86436a68ff0c08c548b8dd8b2031aa06ee2;hpb=1afc887a2040dfdedfa66913e94ff7a9634f648f;p=blank.git

diff --git a/src/net/Packet.hpp b/src/net/Packet.hpp
index bd9dd86..4742a45 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);
@@ -45,6 +53,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>
@@ -72,6 +84,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 +95,49 @@ 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 = 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;
+	};
+
+	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() {
@@ -105,7 +161,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;