X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fnet%2FPacket.hpp;h=87dececf9957f7c12ef960d59d6b0b7086ba802a;hb=8e7e042296946ba2aed73b77ab02feb267eb17d4;hp=76cd966bed681aec73e22f8c9a87276eb1cc4569;hpb=d4c71969df4f6b5e6b750c98268d30ca6784908b;p=blank.git

diff --git a/src/net/Packet.hpp b/src/net/Packet.hpp
index 76cd966..87decec 100644
--- a/src/net/Packet.hpp
+++ b/src/net/Packet.hpp
@@ -10,6 +10,7 @@
 namespace blank {
 
 class Entity;
+class EntityState;
 
 struct Packet {
 
@@ -25,7 +26,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 {
@@ -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,7 +101,7 @@ 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 {
@@ -131,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;
 	};