X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fserver%2FClientConnection.hpp;h=11670bcee6da3e8e4fc4c5117899e327bcd1d0e0;hb=ca90ec459ca0bd48c1483a45f30496aed61e9c21;hp=4927d1ce831fb9ab26c15cbeb68db9826b3c497c;hpb=c1da86ebab41895bf49ed747c75ecf722e8c5586;p=blank.git diff --git a/src/server/ClientConnection.hpp b/src/server/ClientConnection.hpp index 4927d1c..11670bc 100644 --- a/src/server/ClientConnection.hpp +++ b/src/server/ClientConnection.hpp @@ -19,7 +19,7 @@ namespace blank { -class CompositeModel; +class Model; namespace server { @@ -57,9 +57,11 @@ public: ChunkIndex &PlayerChunks() noexcept { return input->GetPlayer().GetChunks(); } const ChunkIndex &PlayerChunks() const noexcept { return input->GetPlayer().GetChunks(); } - void SetPlayerModel(const CompositeModel &) noexcept; + void SetPlayerModel(const Model &) noexcept; bool HasPlayerModel() const noexcept; - const CompositeModel &GetPlayerModel() const noexcept; + const Model &GetPlayerModel() const noexcept; + + bool ChunkInRange(const glm::ivec3 &) const noexcept; private: struct SpawnStatus { @@ -98,7 +100,7 @@ private: Server &server; Connection conn; std::unique_ptr input; - const CompositeModel *player_model; + const Model *player_model; std::list spawns; unsigned int confirm_wait;