X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fclient%2Fnet.cpp;h=f1e555336699738a4434470c1bd1955ad8bea4d4;hb=20d0a76d2519c71009c3b3babec0df27529f8142;hp=bd2a43abd002a20224e8019ff36f203c08989061;hpb=ed3bdc028edc0ecb5835d1c0bf18dbc59b342daf;p=blank.git diff --git a/src/client/net.cpp b/src/client/net.cpp index bd2a43a..f1e5553 100644 --- a/src/client/net.cpp +++ b/src/client/net.cpp @@ -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(); } @@ -426,13 +431,13 @@ void NetworkedInput::MergePlayerCorrection(uint16_t seq, const EntityState &corr vector col; while (entry != end) { SetMovement(entry->movement); - GetWorld().Update(replay, entry->delta_t); + replay.Update(GetWorld(), entry->delta_t); entry->state.pos = replay.GetState().pos; ++entry; } 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::epsilon()) { SetMovement(restore_movement);