X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fstandalone%2FMasterState.hpp;h=97834e6371db843f003fe5dbee5326a45452366c;hb=07b8335e7bfd631e0878e183c87238812d632c56;hp=823e7f3a67ed781f1c274e5f598c004839bb8966;hpb=a50aa0f2a2fea14f5f8c56209e2ecde3088ef913;p=blank.git

diff --git a/src/standalone/MasterState.hpp b/src/standalone/MasterState.hpp
index 823e7f3..97834e6 100644
--- a/src/standalone/MasterState.hpp
+++ b/src/standalone/MasterState.hpp
@@ -7,13 +7,14 @@
 #include "PreloadState.hpp"
 #include "UnloadState.hpp"
 #include "../ai/Spawner.hpp"
+#include "../audio/SoundBank.hpp"
 #include "../graphics/SkyBox.hpp"
-#include "../model/Skeletons.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"
@@ -40,8 +41,10 @@ public:
 		const World::Config &,
 		const WorldSave &
 	);
+	~MasterState();
 
-	void OnEnter() override;
+	void OnResume() override;
+	void OnPause() override;
 
 	void Handle(const SDL_Event &) override;
 	void Update(int dt) override;
@@ -59,10 +62,13 @@ public:
 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;
@@ -70,7 +76,6 @@ private:
 	Generator generator;
 	ChunkLoader chunk_loader;
 	ChunkRenderer chunk_renderer;
-	Skeletons skeletons;
 	Spawner spawner;
 
 	SkyBox sky;