X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;ds=sidebyside;f=src%2Fstandalone%2FMasterState.hpp;h=6e630200fa9eab8e60b653e7fb5bf76cae1b9d53;hb=9c5308ba4108bd842af6d9d2e893ea575a7e6ca8;hp=680bb5e620cbaa15a9a3f6414f02ecf0c767263c;hpb=3a487f44c26f9bb9d1a1c831406b6497b2b3b425;p=blank.git

diff --git a/src/standalone/MasterState.hpp b/src/standalone/MasterState.hpp
index 680bb5e..6e63020 100644
--- a/src/standalone/MasterState.hpp
+++ b/src/standalone/MasterState.hpp
@@ -8,13 +8,11 @@
 #include "UnloadState.hpp"
 #include "../ai/Spawner.hpp"
 #include "../graphics/SkyBox.hpp"
-#include "../model/ShapeRegistry.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"
@@ -63,8 +61,7 @@ public:
 private:
 	Config &config;
 	Environment &env;
-	ShapeRegistry shapes;
-	BlockTypeRegistry block_types;
+	WorldResources res;
 	const WorldSave &save;
 	World world;
 	ChunkIndex &spawn_index;
@@ -77,7 +74,6 @@ private:
 	Generator generator;
 	ChunkLoader chunk_loader;
 	ChunkRenderer chunk_renderer;
-	Skeletons skeletons;
 	Spawner spawner;
 
 	SkyBox sky;