X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fnet%2FClientConnection.hpp;h=fb6420acfed074959df27449741d3cb80cb5526c;hb=d4c71969df4f6b5e6b750c98268d30ca6784908b;hp=8c5306c07945d4f80d4af15c44400d160508126e;hpb=c6ca9d21e45af5ea7caeec722a9b59fdf3aa3b24;p=blank.git diff --git a/src/net/ClientConnection.hpp b/src/net/ClientConnection.hpp index 8c5306c..fb6420a 100644 --- a/src/net/ClientConnection.hpp +++ b/src/net/ClientConnection.hpp @@ -4,6 +4,7 @@ #include "Connection.hpp" #include "ConnectionHandler.hpp" +#include #include @@ -30,15 +31,42 @@ public: void DetachPlayer(); bool HasPlayer() const noexcept { return player; } Entity &Player() noexcept { return *player; } + const Entity &Player() const noexcept { return *player; } + +private: + struct SpawnStatus { + // the entity in question + Entity *const entity = nullptr; + // sequence number of the spawn packet or -1 after it's been ack'd + std::int32_t spawn_pack = -1; + // sequence number of the despawn packet or -1 if no despawn has been sent + std::int32_t despawn_pack = -1; + + explicit SpawnStatus(Entity &); + ~SpawnStatus(); + }; + +private: + void OnPacketReceived(std::uint16_t) override; + void OnPacketLost(std::uint16_t) override; void On(const Packet::Login &) override; void On(const Packet::Part &) override; void On(const Packet::PlayerUpdate &) override; + bool CanSpawn(const Entity &) const noexcept; + bool CanDespawn(const Entity &) const noexcept; + + void SendSpawn(SpawnStatus &); + void SendDespawn(SpawnStatus &); + void SendUpdate(SpawnStatus &); + private: Server &server; Connection conn; Entity *player; + std::list spawns; + unsigned int confirm_wait; };