X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fserver%2Fnet.cpp;h=f5e974d7e71bcfb9808e08a7d9fc909aa1dbe2d8;hb=b07f3c123fff221edeffb4864bab7db88d0d1f4d;hp=e8325da1bd4ea1f0cfd08f0eda206d2e845e2f0e;hpb=fa3c4a14546d73ddc2671cd5cc58208839bf7173;p=blank.git

diff --git a/src/server/net.cpp b/src/server/net.cpp
index e8325da..f5e974d 100644
--- a/src/server/net.cpp
+++ b/src/server/net.cpp
@@ -6,6 +6,7 @@
 #include "../geometry/distance.hpp"
 #include "../io/WorldSave.hpp"
 #include "../model/Model.hpp"
+#include "../shared/CommandService.hpp"
 #include "../world/ChunkIndex.hpp"
 #include "../world/Entity.hpp"
 #include "../world/World.hpp"
@@ -355,7 +356,7 @@ void ClientConnection::SendUpdates() {
 void ClientConnection::CheckPlayerFix() {
 	// player_update_state's position holds the client's most recent prediction
 	glm::vec3 diff = player_update_state.Diff(PlayerEntity().GetState());
-	float dist_squared = dot(diff, diff);
+	float dist_squared = glm::length2(diff);
 
 	// if client's prediction is off by more than 1cm, send
 	// our (authoritative) state back so it can fix it
@@ -647,7 +648,7 @@ uint16_t ClientConnection::SendMessage(uint8_t type, uint32_t from, const string
 
 
 NetworkCLIFeedback::NetworkCLIFeedback(Player &p, ClientConnection &c)
-: CLIContext(p)
+: CLIContext(&p)
 , conn(c) {
 
 }
@@ -665,6 +666,10 @@ void NetworkCLIFeedback::Broadcast(const string &msg) {
 }
 
 
+// relying on {} zero intitialization for UDPpacket, because
+// the type and number of fields is not well defined
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
 Server::Server(
 	const Config::Network &conf,
 	World &world,
@@ -678,7 +683,9 @@ Server::Server(
 , spawn_index(world.Chunks().MakeIndex(wc.spawn, 3))
 , save(save)
 , player_model(nullptr)
-, cli(world) {
+, cli(world)
+, cmd_srv() {
+#pragma GCC diagnostic pop
 	if (!serv_set) {
 		throw NetError("SDLNet_AllocSocketSet");
 	}
@@ -697,6 +704,10 @@ Server::Server(
 
 	serv_pack.data = new Uint8[sizeof(Packet)];
 	serv_pack.maxlen = sizeof(Packet);
+
+	if (conf.cmd_port) {
+		cmd_srv.reset(new CommandService(cli, conf.cmd_port));
+	}
 }
 
 Server::~Server() {
@@ -714,10 +725,16 @@ Server::~Server() {
 
 void Server::Wait(int dt) noexcept {
 	SDLNet_CheckSockets(serv_set, dt);
+	if (cmd_srv) {
+		cmd_srv->Wait(0);
+	}
 }
 
 bool Server::Ready() noexcept {
-	return SDLNet_CheckSockets(serv_set, 0) > 0;
+	if (SDLNet_CheckSockets(serv_set, 0) > 0) {
+		return true;
+	}
+	return cmd_srv && cmd_srv->Ready();
 }
 
 void Server::Handle() {
@@ -730,6 +747,9 @@ void Server::Handle() {
 		// a boo boo happened
 		throw NetError("SDLNet_UDP_Recv");
 	}
+	if (cmd_srv) {
+		cmd_srv->Handle();
+	}
 }
 
 void Server::HandlePacket(const UDPpacket &udp_pack) {
@@ -769,6 +789,9 @@ void Server::Update(int dt) {
 			++client;
 		}
 	}
+	if (cmd_srv) {
+		cmd_srv->Send();
+	}
 }
 
 void Server::SetPlayerModel(const Model &m) noexcept {