X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fclient%2FInteractiveState.hpp;h=f371c8ca837aeb094c7ef5dc719b3f1b84c494f7;hb=e5caf98d970fe569fd8484dd0d6ea738f8251ae4;hp=b86258e9f2bb892bb06309f3e29a9c39ff717dc2;hpb=07b8335e7bfd631e0878e183c87238812d632c56;p=blank.git

diff --git a/src/client/InteractiveState.hpp b/src/client/InteractiveState.hpp
index b86258e..f371c8c 100644
--- a/src/client/InteractiveState.hpp
+++ b/src/client/InteractiveState.hpp
@@ -11,6 +11,7 @@
 #include "../graphics/SkyBox.hpp"
 #include "../io/WorldSave.hpp"
 #include "../net/Packet.hpp"
+#include "../shared/ChatState.hpp"
 #include "../shared/WorldResources.hpp"
 #include "../ui/HUD.hpp"
 #include "../ui/InteractiveManipulator.hpp"
@@ -31,16 +32,22 @@ class MasterState;
 
 class InteractiveState
 : public State
-, public ClientController {
+, public ClientController
+, public ChatState::Responder {
 
 public:
 	explicit InteractiveState(MasterState &, std::uint32_t player_id);
 
 	World &GetWorld() noexcept { return world; }
 	Player &GetPlayer() noexcept { return player; }
+	PlayerController &GetPlayerController() noexcept { return input; }
 	ChunkReceiver &GetChunkReceiver() noexcept { return chunk_receiver; }
 
-	void OnEnter() override;
+	void OnResume() override;
+	void OnPause() override;
+
+	void OnFocus() override;
+	void OnBlur() override;
 
 	void Handle(const SDL_Event &) override;
 	void Update(int dt) override;
@@ -51,13 +58,17 @@ public:
 	void Handle(const Packet::EntityUpdate &);
 	void Handle(const Packet::PlayerCorrection &);
 	void Handle(const Packet::BlockUpdate &);
+	void Handle(const Packet::Message &);
 
 	void SetAudio(bool) override;
 	void SetVideo(bool) override;
 	void SetHUD(bool) override;
 	void SetDebug(bool) override;
+	void NextCamera() override;
 	void Exit() override;
 
+	void OnLineSubmit(const std::string &) override;
+
 private:
 	/// flag entity as updated by given packet
 	/// returns false if the update should be ignored
@@ -78,7 +89,8 @@ private:
 	Interface interface;
 	ChunkReceiver chunk_receiver;
 	ChunkRenderer chunk_renderer;
-	IntervalTimer loop_timer;
+	CoarseTimer loop_timer;
+	CoarseTimer stat_timer;
 
 	SkyBox sky;
 
@@ -88,6 +100,11 @@ private:
 	};
 	std::map<std::uint32_t, UpdateStatus> update_status;
 
+	ChatState chat;
+
+	int time_skipped;
+	unsigned int packets_skipped;
+
 };
 
 }