centralize entity controllers

[blank.git] / src / client / NetworkedInput.hpp

diff --git a/src/client/NetworkedInput.hpp b/src/client/NetworkedInput.hpp
index a6702228a149e6c1b80f78812a0dcd510e8e9ec3..b557b1b0b3eb289f92aa8e152d8398ea68ca5644 100644 (file)
--- a/src/client/NetworkedInput.hpp
+++ b/src/client/NetworkedInput.hpp
@@ -20,7 +20,7 @@ class NetworkedInput
 public:
        explicit NetworkedInput(World &, Player &, Client &);
 
-       void Update(int dt);
+       void Update(Entity &, float dt) override;
        void PushPlayerUpdate(int dt);
        void MergePlayerCorrection(std::uint16_t, const EntityState &);
 
@@ -36,11 +36,11 @@ private:
 
        struct PlayerHistory {
                EntityState state;
-               glm::vec3 tgt_vel;
+               glm::vec3 movement;
                float delta_t;
                std::uint16_t packet;
-               PlayerHistory(EntityState s, const glm::vec3 &tv, float dt, std::uint16_t p)
-               : state(s), tgt_vel(tv), delta_t(dt), packet(p) { }
+               PlayerHistory(EntityState s, const glm::vec3 &mv, float dt, std::uint16_t p)
+               : state(s), movement(mv), delta_t(dt), packet(p) { }
        };
        std::list<PlayerHistory> player_hist;