X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fstandalone%2FMasterState.hpp;h=f72c38ceed7b73f83059b3e1249c4da46f4c42f9;hb=7e782291e0ce39eb2d4e8c1df28f682c313e6f8d;hp=9e0b8e4c68e119fade7c03636bff1b71f79e30fb;hpb=04531ab5fc3d82ba5b5d456bcc277fe6499e1150;p=blank.git

diff --git a/src/standalone/MasterState.hpp b/src/standalone/MasterState.hpp
index 9e0b8e4..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"
@@ -62,7 +63,9 @@ public:
 private:
 	Config &config;
 	Environment &env;
+	ShapeRegistry shapes;
 	BlockTypeRegistry block_types;
+	ModelRegistry models;
 	const WorldSave &save;
 	World world;
 	ChunkIndex &spawn_index;
@@ -75,7 +78,6 @@ private:
 	Generator generator;
 	ChunkLoader chunk_loader;
 	ChunkRenderer chunk_renderer;
-	Skeletons skeletons;
 	Spawner spawner;
 
 	SkyBox sky;