X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fclient%2Fnet.cpp;h=879dfb10ef8908cc30f3b4a07f62d50318e2b2a5;hb=c0a5ece0f6bacea1b85157a908d710070fb0affd;hp=bb28f15a7394347ff8a2a898aec3ff33f62d29c6;hpb=da21395e4900bf283ece7364c67d9bad27dca279;p=blank.git

diff --git a/src/client/net.cpp b/src/client/net.cpp
index bb28f15..879dfb1 100644
--- a/src/client/net.cpp
+++ b/src/client/net.cpp
@@ -3,7 +3,7 @@
 #include "Client.hpp"
 #include "NetworkedInput.hpp"
 
-#include "../app/init.hpp"
+#include "../app/error.hpp"
 #include "../geometry/distance.hpp"
 #include "../io/WorldSave.hpp"
 #include "../net/Packet.hpp"
@@ -244,10 +244,15 @@ IPaddress client_resolve(const char *host, Uint16 port) {
 
 }
 
+// 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"
 Client::Client(const Config::Network &conf)
 : conn(client_resolve(conf.host.c_str(), conf.port))
 , client_sock(client_bind(0))
 , client_pack{ -1, nullptr, 0 } {
+#pragma GCC diagnostic pop
 	client_pack.data = new Uint8[sizeof(Packet)];
 	client_pack.maxlen = sizeof(Packet);
 	// establish connection
@@ -306,8 +311,8 @@ uint16_t Client::SendLogin(const string &name) {
 uint16_t Client::SendPlayerUpdate(
 	const EntityState &prediction,
 	const glm::vec3 &movement,
-	float pitch,
-	float yaw,
+	float,
+	float,
 	uint8_t actions,
 	uint8_t slot
 ) {
@@ -359,7 +364,7 @@ bool NetworkedInput::UpdateImportant() const noexcept {
 	return old_actions != actions || !iszero(old_movement - GetMovement());
 }
 
-void NetworkedInput::Update(Entity &, float dt) {
+void NetworkedInput::Update(Entity &, float) {
 	Invalidate();
 	UpdatePlayer();
 }
@@ -432,7 +437,7 @@ void NetworkedInput::MergePlayerCorrection(uint16_t seq, const EntityState &corr
 	}
 
 	glm::vec3 displacement(replay.GetState().Diff(player_state));
-	const float disp_squared = dot(displacement, displacement);
+	const float disp_squared = glm::dot(displacement, displacement);
 
 	if (disp_squared < 16.0f * numeric_limits<float>::epsilon()) {
 		SetMovement(restore_movement);