X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fserver%2FClientConnection.hpp;h=3ab0453e87a1d46e5c18262ad974bd3e01287f84;hb=ce10bfbe252d5598bbb559c6ce55aed1b9393227;hp=0a5dcd034db106e0b868ae8fe82b9a9505636a5d;hpb=150d065f431d665326fd8028748c48a74ad956bb;p=blank.git

diff --git a/src/server/ClientConnection.hpp b/src/server/ClientConnection.hpp
index 0a5dcd0..3ab0453 100644
--- a/src/server/ClientConnection.hpp
+++ b/src/server/ClientConnection.hpp
@@ -2,6 +2,7 @@
 #define BLANK_SERVER_CLIENTCONNECTION_HPP_
 
 #include "ChunkTransmitter.hpp"
+#include "NetworkCLIFeedback.hpp"
 #include "Server.hpp"
 #include "../app/IntervalTimer.hpp"
 #include "../ui/DirectInput.hpp"
@@ -10,6 +11,7 @@
 #include "../world/EntityState.hpp"
 #include "../world/Player.hpp"
 
+#include <cstdint>
 #include <deque>
 #include <list>
 #include <memory>
@@ -39,6 +41,8 @@ public:
 	Connection &GetConnection() noexcept { return conn; }
 	bool Disconnected() const noexcept { return conn.Closed(); }
 
+	Server &GetServer() noexcept { return server; }
+
 	/// prepare a packet of given type
 	template<class Type>
 	Type Prepare() const noexcept {
@@ -46,7 +50,7 @@ public:
 	}
 	/// send the previously prepared packet
 	std::uint16_t Send();
-	/// send the previously prepared packet of non-default length
+	/// send the previously prepared packet of given payload length
 	std::uint16_t Send(std::size_t len);
 
 	void AttachPlayer(Player &);
@@ -63,6 +67,8 @@ public:
 
 	bool ChunkInRange(const glm::ivec3 &) const noexcept;
 
+	std::uint16_t SendMessage(std::uint8_t type, std::uint32_t from, const std::string &msg);
+
 private:
 	struct SpawnStatus {
 		// the entity in question
@@ -83,13 +89,17 @@ private:
 	void On(const Packet::Login &) override;
 	void On(const Packet::Part &) override;
 	void On(const Packet::PlayerUpdate &) override;
+	void On(const Packet::ChunkBegin &) override;
 	void On(const Packet::Message &) override;
 
+	void CheckEntities();
 	bool CanSpawn(const Entity &) const noexcept;
 	bool CanDespawn(const Entity &) const noexcept;
 
 	void SendSpawn(SpawnStatus &);
 	void SendDespawn(SpawnStatus &);
+	/// true if entity updates are pushed to the client this frame
+	bool SendingUpdates() const noexcept;
 	void QueueUpdate(SpawnStatus &);
 	void SendUpdates();
 
@@ -101,11 +111,13 @@ private:
 	Server &server;
 	Connection conn;
 	std::unique_ptr<DirectInput> input;
+	std::unique_ptr<NetworkCLIFeedback> cli_ctx;
 	const Model *player_model;
 	std::list<SpawnStatus> spawns;
 	unsigned int confirm_wait;
 
 	std::vector<SpawnStatus *> entity_updates;
+	unsigned int entity_updates_skipped;
 
 	EntityState player_update_state;
 	std::uint16_t player_update_pack;
@@ -115,6 +127,7 @@ private:
 	ChunkTransmitter transmitter;
 	std::deque<glm::ivec3> chunk_queue;
 	glm::ivec3 old_base;
+	unsigned int chunk_blocks_skipped;
 
 };