X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fclient%2FInteractiveState.hpp;h=86757a294c10501dd28c074a28ba59410220bb59;hb=bc2806164f55b7ac48dbb6d224b7d4b55683decf;hp=1b9c9a5ba06fc4b42a6a92399daee24ab6ce144a;hpb=b066e776622f96e906600a0c4a08de392bd03676;p=blank.git

diff --git a/src/client/InteractiveState.hpp b/src/client/InteractiveState.hpp
index 1b9c9a5..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 "../ui/DirectInput.hpp"
+#include "../net/Packet.hpp"
 #include "../ui/HUD.hpp"
 #include "../ui/InteractiveManipulator.hpp"
 #include "../ui/Interface.hpp"
@@ -20,8 +21,6 @@
 #include "../world/Player.hpp"
 #include "../world/World.hpp"
 
-#include <list>
-
 
 namespace blank {
 
@@ -49,8 +48,8 @@ public:
 	void Update(int dt) override;
 	void Render(Viewport &) override;
 
-	void PushPlayerUpdate(const Entity &, int dt);
 	void MergePlayerCorrection(std::uint16_t, const EntityState &);
+	void Handle(const Packet::BlockUpdate &);
 
 	void SetAudio(bool) override;
 	void SetVideo(bool) override;
@@ -60,15 +59,15 @@ public:
 
 private:
 	MasterState &master;
+	ShapeRegistry shapes;
 	BlockTypeRegistry block_types;
 	WorldSave save;
 	World world;
 	Player &player;
 	HUD hud;
 	InteractiveManipulator manip;
-	DirectInput input;
+	NetworkedInput input;
 	Interface interface;
-	ChunkRequester chunk_requester;
 	ChunkReceiver chunk_receiver;
 	ChunkRenderer chunk_renderer;
 	Skeletons skeletons;
@@ -76,15 +75,6 @@ private:
 
 	SkyBox sky;
 
-	struct PlayerHistory {
-		EntityState state;
-		int delta_t;
-		std::uint16_t packet;
-		PlayerHistory(EntityState s, int dt, std::uint16_t p)
-		: state(s), delta_t(dt), packet(p) { }
-	};
-	std::list<PlayerHistory> player_hist;
-
 };
 
 }