X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fserver%2Fnet.cpp;h=6ceb186644d3a9f7d5d24526d3cfb2376492db8c;hb=dbd214ac278019c20c883cbb76456b0b0fddc063;hp=27643ee8fc34abb4d9b18c0b2b47f0837df7f491;hpb=9711e8f340be713d9c4949cc92e680b2c3349bc4;p=blank.git

diff --git a/src/server/net.cpp b/src/server/net.cpp
index 27643ee..6ceb186 100644
--- a/src/server/net.cpp
+++ b/src/server/net.cpp
@@ -4,7 +4,7 @@
 
 #include "../app/init.hpp"
 #include "../io/WorldSave.hpp"
-#include "../model/CompositeModel.hpp"
+#include "../model/Model.hpp"
 #include "../world/ChunkIndex.hpp"
 #include "../world/Entity.hpp"
 #include "../world/World.hpp"
@@ -446,7 +446,7 @@ void ClientConnection::DetachPlayer() {
 	old_actions = 0;
 }
 
-void ClientConnection::SetPlayerModel(const CompositeModel &m) noexcept {
+void ClientConnection::SetPlayerModel(const Model &m) noexcept {
 	player_model = &m;
 	if (HasPlayer()) {
 		m.Instantiate(PlayerEntity().GetModel());
@@ -457,7 +457,7 @@ bool ClientConnection::HasPlayerModel() const noexcept {
 	return player_model;
 }
 
-const CompositeModel &ClientConnection::GetPlayerModel() const noexcept {
+const Model &ClientConnection::GetPlayerModel() const noexcept {
 	return *player_model;
 }
 
@@ -582,6 +582,19 @@ bool ClientConnection::ChunkInRange(const glm::ivec3 &pos) const noexcept {
 	return HasPlayer() && PlayerChunks().InRange(pos);
 }
 
+void ClientConnection::On(const Packet::Message &pack) {
+	uint8_t type;
+	uint32_t ref;
+	string msg;
+	pack.ReadType(type);
+	pack.ReadReferral(ref);
+	pack.ReadMessage(msg);
+
+	if (type == 1 && HasPlayer()) {
+		server.DistributeMessage(1, PlayerEntity().ID(), msg);
+	}
+}
+
 
 Server::Server(
 	const Config::Network &conf,
@@ -662,7 +675,7 @@ void Server::Update(int dt) {
 	}
 }
 
-void Server::SetPlayerModel(const CompositeModel &m) noexcept {
+void Server::SetPlayerModel(const Model &m) noexcept {
 	player_model = &m;
 	for (ClientConnection &client : clients) {
 		client.SetPlayerModel(m);
@@ -673,7 +686,7 @@ bool Server::HasPlayerModel() const noexcept {
 	return player_model;
 }
 
-const CompositeModel &Server::GetPlayerModel() const noexcept {
+const Model &Server::GetPlayerModel() const noexcept {
 	return *player_model;
 }
 
@@ -709,5 +722,20 @@ void Server::SetBlock(Chunk &chunk, int index, const Block &block) {
 	}
 }
 
+void Server::DistributeMessage(uint8_t type, uint32_t ref, const string &msg) {
+	auto pack = Packet::Make<Packet::Message>(serv_pack);
+	pack.WriteType(type);
+	pack.WriteReferral(ref);
+	pack.WriteMessage(msg);
+	serv_pack.len = sizeof(Packet::Header) + Packet::Message::GetSize(msg);
+	SendAll();
+}
+
+void Server::SendAll() {
+	for (ClientConnection &client : clients) {
+		client.GetConnection().Send(serv_pack, serv_sock);
+	}
+}
+
 }
 }