X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fnet%2FClientConnection.hpp;h=f344efdcf883d6aa277e97ae2327ed8b34f4e089;hb=ac41db13c9d64f5ef12b26c335d57504d02fd2fd;hp=8c5306c07945d4f80d4af15c44400d160508126e;hpb=c6ca9d21e45af5ea7caeec722a9b59fdf3aa3b24;p=blank.git

diff --git a/src/net/ClientConnection.hpp b/src/net/ClientConnection.hpp
index 8c5306c..f344efd 100644
--- a/src/net/ClientConnection.hpp
+++ b/src/net/ClientConnection.hpp
@@ -3,7 +3,10 @@
 
 #include "Connection.hpp"
 #include "ConnectionHandler.hpp"
+#include "../app/IntervalTimer.hpp"
+#include "../world/EntityState.hpp"
 
+#include <list>
 #include <SDL_net.h>
 
 
@@ -30,15 +33,47 @@ public:
 	void DetachPlayer();
 	bool HasPlayer() const noexcept { return player; }
 	Entity &Player() noexcept { return *player; }
+	const Entity &Player() const noexcept { return *player; }
+
+private:
+	struct SpawnStatus {
+		// the entity in question
+		Entity *const entity = nullptr;
+		// sequence number of the spawn packet or -1 after it's been ack'd
+		std::int32_t spawn_pack = -1;
+		// sequence number of the despawn packet or -1 if no despawn has been sent
+		std::int32_t despawn_pack = -1;
+
+		explicit SpawnStatus(Entity &);
+		~SpawnStatus();
+	};
+
+private:
+	void OnPacketReceived(std::uint16_t) override;
+	void OnPacketLost(std::uint16_t) override;
 
 	void On(const Packet::Login &) override;
 	void On(const Packet::Part &) override;
 	void On(const Packet::PlayerUpdate &) override;
 
+	bool CanSpawn(const Entity &) const noexcept;
+	bool CanDespawn(const Entity &) const noexcept;
+
+	void SendSpawn(SpawnStatus &);
+	void SendDespawn(SpawnStatus &);
+	void SendUpdate(SpawnStatus &);
+
+	void CheckPlayerFix();
+
 private:
 	Server &server;
 	Connection conn;
 	Entity *player;
+	std::list<SpawnStatus> spawns;
+	unsigned int confirm_wait;
+	EntityState player_update_state;
+	std::uint16_t player_update_pack;
+	IntervalTimer player_update_timer;
 
 };