second attempt at "nice" client state correction

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

diff --git a/src/client/MasterState.hpp b/src/client/MasterState.hpp
index af2e6aac8710a7b92e4af91566766e8387a43a0c..aaea6a99b442aa152b209d0f6953261746025b50 100644 (file)
--- a/src/client/MasterState.hpp
+++ b/src/client/MasterState.hpp
@@ -5,8 +5,9 @@
 #include "InteractiveState.hpp"
 #include "../app/State.hpp"
 #include "../net/Client.hpp"
-#include "../net/PacketHandler.hpp"
+#include "../net/ConnectionHandler.hpp"
 
+#include <map>
 #include <memory>
 
 
@@ -20,7 +21,7 @@ class InteractiveState;
 
 class MasterState
 : public State
-, public PacketHandler {
+, public ConnectionHandler {
 
 public:
        MasterState(
@@ -46,8 +47,22 @@ public:
        void Update(int dt) override;
        void Render(Viewport &) override;
 
+       void OnPacketLost(std::uint16_t) override;
+       void OnTimeout() override;
+
        void On(const Packet::Join &) override;
        void On(const Packet::Part &) override;
+       void On(const Packet::SpawnEntity &) override;
+       void On(const Packet::DespawnEntity &) override;
+       void On(const Packet::EntityUpdate &) override;
+       void On(const Packet::PlayerCorrection &) override;
+
+private:
+       /// flag entity as updated by given packet
+       /// returns false if the update should be ignored
+       bool UpdateEntity(std::uint32_t id, std::uint16_t seq);
+       /// drop update information or given entity
+       void ClearEntity(std::uint32_t id);
 
 private:
        Environment &env;
@@ -59,6 +74,15 @@ private:
 
        InitialState init_state;
 
+       int login_packet;
+
+       struct UpdateStatus {
+               std::uint16_t last_packet;
+               int last_update;
+       };
+       std::map<std::uint32_t, UpdateStatus> update_status;
+       IntervalTimer update_timer;
+
 };
 
 }