X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fstandalone%2FMasterState.hpp;h=f72c38ceed7b73f83059b3e1249c4da46f4c42f9;hb=4e3afb4c7631591b80cb7740a9b6f46da69b7ae4;hp=84c331523e43a4602a52a07d4eed6cdd7bbd22a1;hpb=5178dd1e226d45db7ae61e3d7d6866dc4254d9ae;p=blank.git

diff --git a/src/standalone/MasterState.hpp b/src/standalone/MasterState.hpp
index 84c3315..f72c38c 100644
--- a/src/standalone/MasterState.hpp
+++ b/src/standalone/MasterState.hpp
@@ -8,7 +8,8 @@
 #include "UnloadState.hpp"
 #include "../ai/Spawner.hpp"
 #include "../graphics/SkyBox.hpp"
-#include "../model/Skeletons.hpp"
+#include "../model/ModelRegistry.hpp"
+#include "../model/ShapeRegistry.hpp"
 #include "../ui/DirectInput.hpp"
 #include "../ui/HUD.hpp"
 #include "../ui/InteractiveManipulator.hpp"
@@ -43,7 +44,8 @@ public:
 	);
 	~MasterState();
 
-	void OnEnter() override;
+	void OnResume() override;
+	void OnPause() override;
 
 	void Handle(const SDL_Event &) override;
 	void Update(int dt) override;
@@ -61,11 +63,14 @@ public:
 private:
 	Config &config;
 	Environment &env;
+	ShapeRegistry shapes;
 	BlockTypeRegistry block_types;
+	ModelRegistry models;
 	const WorldSave &save;
 	World world;
 	ChunkIndex &spawn_index;
 	Player &player;
+	bool spawn_player;
 	HUD hud;
 	InteractiveManipulator manip;
 	DirectInput input;
@@ -73,7 +78,6 @@ private:
 	Generator generator;
 	ChunkLoader chunk_loader;
 	ChunkRenderer chunk_renderer;
-	Skeletons skeletons;
 	Spawner spawner;
 
 	SkyBox sky;