glm backwards compatibility

[blank.git] / src / client / net.cpp

diff --git a/src/client/net.cpp b/src/client/net.cpp
index 75865be577dfac866df3ac302ac85f0a491e440e..551087210e2b99b76d98f17433345dd8fecbdb0d 100644 (file)
--- a/src/client/net.cpp
+++ b/src/client/net.cpp
@@ -185,6 +185,7 @@ void ChunkReceiver::Commit(ChunkTransmission &trans) {
        } else {
                memcpy(dst, src, min(src_len, dst_len));
        }
+       chunk->ScanActive();
        chunk->Invalidate();
        trans.Clear();
 }
@@ -425,13 +426,13 @@ void NetworkedInput::MergePlayerCorrection(uint16_t seq, const EntityState &corr
        vector<WorldCollision> 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<float>::epsilon()) {
                SetMovement(restore_movement);