X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fserver%2FClientConnection.hpp;h=3ab0453e87a1d46e5c18262ad974bd3e01287f84;hb=3185bad87c06739e4ec19b456c7158437ba9621f;hp=bd42241d9974897a8210afc3479e500c3e6e1c53;hpb=56069d41c1553d87a8759713ef391d3a908adc0e;p=blank.git

diff --git a/src/server/ClientConnection.hpp b/src/server/ClientConnection.hpp
index bd42241..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 {
@@ -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,6 +89,7 @@ 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();
@@ -104,6 +111,7 @@ 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;