X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fstandalone%2FMasterState.hpp;h=04234e5ccea07d18eb99683e6cca088ee0e279c2;hb=3185bad87c06739e4ec19b456c7158437ba9621f;hp=680bb5e620cbaa15a9a3f6414f02ecf0c767263c;hpb=3a487f44c26f9bb9d1a1c831406b6497b2b3b425;p=blank.git

diff --git a/src/standalone/MasterState.hpp b/src/standalone/MasterState.hpp
index 680bb5e..04234e5 100644
--- a/src/standalone/MasterState.hpp
+++ b/src/standalone/MasterState.hpp
@@ -4,17 +4,19 @@
 #include "../app/State.hpp"
 #include "../ui/ClientController.hpp"
 
+#include "DirectCLIFeedback.hpp"
 #include "PreloadState.hpp"
 #include "UnloadState.hpp"
 #include "../ai/Spawner.hpp"
+#include "../audio/SoundBank.hpp"
 #include "../graphics/SkyBox.hpp"
-#include "../model/ShapeRegistry.hpp"
-#include "../model/Skeletons.hpp"
+#include "../shared/ChatState.hpp"
+#include "../shared/CLI.hpp"
+#include "../shared/WorldResources.hpp"
 #include "../ui/DirectInput.hpp"
 #include "../ui/HUD.hpp"
 #include "../ui/InteractiveManipulator.hpp"
 #include "../ui/Interface.hpp"
-#include "../world/BlockTypeRegistry.hpp"
 #include "../world/ChunkIndex.hpp"
 #include "../world/ChunkLoader.hpp"
 #include "../world/ChunkRenderer.hpp"
@@ -32,7 +34,8 @@ namespace standalone {
 
 class MasterState
 : public State
-, public ClientController {
+, public ClientController
+, public ChatState::Responder {
 
 public:
 	MasterState(
@@ -47,6 +50,9 @@ public:
 	void OnResume() override;
 	void OnPause() override;
 
+	void OnFocus() override;
+	void OnBlur() override;
+
 	void Handle(const SDL_Event &) override;
 	void Update(int dt) override;
 	void Render(Viewport &) override;
@@ -58,13 +64,16 @@ public:
 	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:
 	Config &config;
 	Environment &env;
-	ShapeRegistry shapes;
-	BlockTypeRegistry block_types;
+	WorldResources res;
+	SoundBank sounds;
 	const WorldSave &save;
 	World world;
 	ChunkIndex &spawn_index;
@@ -77,13 +86,16 @@ private:
 	Generator generator;
 	ChunkLoader chunk_loader;
 	ChunkRenderer chunk_renderer;
-	Skeletons skeletons;
 	Spawner spawner;
 
 	SkyBox sky;
 
+	CLI cli;
+	DirectCLIFeedback cli_ctx;
+
 	PreloadState preload;
 	UnloadState unload;
+	ChatState chat;
 
 };