X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fclient%2FInteractiveState.hpp;h=86757a294c10501dd28c074a28ba59410220bb59;hb=bc2806164f55b7ac48dbb6d224b7d4b55683decf;hp=1129e997fdbcfd2f7d1377a73b9b7a61c9d5806a;hpb=c1da86ebab41895bf49ed747c75ecf722e8c5586;p=blank.git diff --git a/src/client/InteractiveState.hpp b/src/client/InteractiveState.hpp index 1129e99..86757a2 100644 --- a/src/client/InteractiveState.hpp +++ b/src/client/InteractiveState.hpp @@ -5,12 +5,13 @@ #include "../ui/ClientController.hpp" #include "ChunkReceiver.hpp" -#include "ChunkRequester.hpp" #include "NetworkedInput.hpp" #include "../app/IntervalTimer.hpp" #include "../graphics/SkyBox.hpp" #include "../io/WorldSave.hpp" +#include "../model/ShapeRegistry.hpp" #include "../model/Skeletons.hpp" +#include "../net/Packet.hpp" #include "../ui/HUD.hpp" #include "../ui/InteractiveManipulator.hpp" #include "../ui/Interface.hpp" @@ -48,6 +49,7 @@ public: void Render(Viewport &) override; void MergePlayerCorrection(std::uint16_t, const EntityState &); + void Handle(const Packet::BlockUpdate &); void SetAudio(bool) override; void SetVideo(bool) override; @@ -57,6 +59,7 @@ public: private: MasterState &master; + ShapeRegistry shapes; BlockTypeRegistry block_types; WorldSave save; World world; @@ -65,7 +68,6 @@ private: InteractiveManipulator manip; NetworkedInput input; Interface interface; - ChunkRequester chunk_requester; ChunkReceiver chunk_receiver; ChunkRenderer chunk_renderer; Skeletons skeletons;