X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fserver%2FClientConnection.hpp;h=2089dd17c8eec85a7acf7e6e7d3d930f03946a5f;hb=b066e776622f96e906600a0c4a08de392bd03676;hp=c5efb51bbd412d7d9aeffbe7e5b29803b83f4a2d;hpb=8ae45b6555d55f301f83daf8c1337d332d8305ab;p=blank.git

diff --git a/src/server/ClientConnection.hpp b/src/server/ClientConnection.hpp
index c5efb51..2089dd1 100644
--- a/src/server/ClientConnection.hpp
+++ b/src/server/ClientConnection.hpp
@@ -12,9 +12,13 @@
 #include <deque>
 #include <list>
 #include <SDL_net.h>
+#include <vector>
 
 
 namespace blank {
+
+class CompositeModel;
+
 namespace server {
 
 class Server;
@@ -43,13 +47,17 @@ public:
 	/// send the previously prepared packet of non-default length
 	std::uint16_t Send(std::size_t len);
 
-	void AttachPlayer(const Player &);
+	void AttachPlayer(Player &);
 	void DetachPlayer();
-	bool HasPlayer() const noexcept { return player.entity; }
-	Entity &PlayerEntity() noexcept { return *player.entity; }
-	const Entity &PlayerEntity() const noexcept { return *player.entity; }
-	ChunkIndex &PlayerChunks() noexcept { return *player.chunks; }
-	const ChunkIndex &PlayerChunks() const noexcept { return *player.chunks; }
+	bool HasPlayer() const noexcept { return player; }
+	Entity &PlayerEntity() noexcept { return player->GetEntity(); }
+	const Entity &PlayerEntity() const noexcept { return player->GetEntity(); }
+	ChunkIndex &PlayerChunks() noexcept { return player->GetChunks(); }
+	const ChunkIndex &PlayerChunks() const noexcept { return player->GetChunks(); }
+
+	void SetPlayerModel(const CompositeModel &) noexcept;
+	bool HasPlayerModel() const noexcept;
+	const CompositeModel &GetPlayerModel() const noexcept;
 
 private:
 	struct SpawnStatus {
@@ -77,7 +85,8 @@ private:
 
 	void SendSpawn(SpawnStatus &);
 	void SendDespawn(SpawnStatus &);
-	void SendUpdate(SpawnStatus &);
+	void QueueUpdate(SpawnStatus &);
+	void SendUpdates();
 
 	void CheckPlayerFix();
 
@@ -86,10 +95,13 @@ private:
 private:
 	Server &server;
 	Connection conn;
-	Player player;
+	Player *player;
+	const CompositeModel *player_model;
 	std::list<SpawnStatus> spawns;
 	unsigned int confirm_wait;
 
+	std::vector<SpawnStatus *> entity_updates;
+
 	EntityState player_update_state;
 	std::uint16_t player_update_pack;
 	IntervalTimer player_update_timer;