X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fnet%2FPacket.hpp;h=09db0dfd1b0ceb4c69d23eae752d58af8f55a10d;hb=38a4cffc0b6aa58e49d24c06aad7bee14cb6515d;hp=232d0be9900d880995c90e77339491ea1194319e;hpb=cf5ce8220483bb062740eeaedde6474928fd5e0e;p=blank.git

diff --git a/src/net/Packet.hpp b/src/net/Packet.hpp
index 232d0be..09db0df 100644
--- a/src/net/Packet.hpp
+++ b/src/net/Packet.hpp
@@ -5,6 +5,7 @@
 #include <ostream>
 #include <string>
 #include <SDL_net.h>
+#include <glm/glm.hpp>
 
 
 namespace blank {
@@ -26,7 +27,7 @@ struct Packet {
 		// 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); }
+		std::uint16_t AckEnd() const noexcept { return ack - std::uint16_t(33); }
 	};
 
 	struct Header {
@@ -54,8 +55,16 @@ struct Packet {
 		std::size_t length;
 		std::uint8_t *data;
 
+		/// WARNING: do not use these if the data doesn not
+		///          point into a real packet's payload
+		const Packet &GetPacket() const noexcept {
+			return *reinterpret_cast<const Packet *>(data - sizeof(Header));
+		}
+		const Header &GetHeader() const noexcept {
+			return GetPacket().header;
+		}
 		std::uint16_t Seq() const noexcept {
-			return reinterpret_cast<const Packet *>(data - sizeof(Header))->header.ctrl.seq;
+			return GetHeader().ctrl.seq;
 		}
 
 		template<class T>
@@ -139,6 +148,45 @@ struct Packet {
 		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;
+	};
+
+	struct ChunkBegin : public Payload {
+		static constexpr std::uint8_t TYPE = 9;
+		static constexpr std::size_t MAX_LEN = 24;
+
+		void WriteTransmissionId(std::uint32_t) noexcept;
+		void ReadTransmissionId(std::uint32_t &) const noexcept;
+		void WriteFlags(std::uint32_t) noexcept;
+		void ReadFlags(std::uint32_t &) const noexcept;
+		void WriteChunkCoords(const glm::ivec3 &) noexcept;
+		void ReadChunkCoords(glm::ivec3 &) const noexcept;
+		void WriteDataSize(std::uint32_t) noexcept;
+		void ReadDataSize(std::uint32_t &) const noexcept;
+	};
+
+	struct ChunkData : public Payload {
+		static constexpr std::uint8_t TYPE = 10;
+		static constexpr std::size_t MAX_LEN = MAX_PAYLOAD_LEN;
+		static constexpr std::size_t MAX_DATA_LEN = MAX_LEN - 12;
+
+		void WriteTransmissionId(std::uint32_t) noexcept;
+		void ReadTransmissionId(std::uint32_t &) const noexcept;
+		void WriteDataOffset(std::uint32_t) noexcept;
+		void ReadDataOffset(std::uint32_t &) const noexcept;
+		void WriteDataSize(std::uint32_t) noexcept;
+		void ReadDataSize(std::uint32_t &) const noexcept;
+		void WriteData(const std::uint8_t *, std::size_t len) noexcept;
+		void ReadData(std::uint8_t *, std::size_t maxlen) const noexcept;
+	};
+
 
 	template<class PayloadType>
 	PayloadType As() {