X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fstandalone%2FMasterState.hpp;h=04234e5ccea07d18eb99683e6cca088ee0e279c2;hb=3767297f8a338bafbc3e621877fb6ba8435680bb;hp=ca5cab29879ebdaf6c9a7cd73ec895736213666a;hpb=e1209ec25c4cc91e13889876106f56bd51aa96e2;p=blank.git

diff --git a/src/standalone/MasterState.hpp b/src/standalone/MasterState.hpp
index ca5cab2..04234e5 100644
--- a/src/standalone/MasterState.hpp
+++ b/src/standalone/MasterState.hpp
@@ -2,39 +2,56 @@
 #define BLANK_STANDALONE_MASTERSTATE_HPP_
 
 #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/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"
 #include "../world/Generator.hpp"
+#include "../world/Player.hpp"
 #include "../world/World.hpp"
 
 
 namespace blank {
 
+class Config;
 class Environment;
 
 namespace standalone {
 
 class MasterState
-: public State {
+: public State
+, public ClientController
+, public ChatState::Responder {
 
 public:
 	MasterState(
 		Environment &,
+		Config &,
 		const Generator::Config &,
-		const Interface::Config &,
 		const World::Config &,
 		const WorldSave &
 	);
+	~MasterState();
 
-	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;
@@ -43,21 +60,42 @@ public:
 	World &GetWorld() noexcept { return world; }
 	Interface &GetInterface() noexcept { return interface; }
 
+	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:
+	Config &config;
 	Environment &env;
-	BlockTypeRegistry block_types;
+	WorldResources res;
+	SoundBank sounds;
+	const WorldSave &save;
 	World world;
+	ChunkIndex &spawn_index;
+	Player &player;
+	bool spawn_player;
+	HUD hud;
+	InteractiveManipulator manip;
+	DirectInput input;
 	Interface interface;
 	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;
 
 };