X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2FWorldState.hpp;h=b48d1b9c0e71285012d7dc7bfbdde978a96ca38e;hb=419c353301a3935be799f261cde9695043e09915;hp=04bf6a84a8100a744018e0f0ba7036a87dff874f;hpb=82ec71079e4763f2b2d66c0c210e37df40c89034;p=blank.git

diff --git a/src/app/WorldState.hpp b/src/app/WorldState.hpp
index 04bf6a8..b48d1b9 100644
--- a/src/app/WorldState.hpp
+++ b/src/app/WorldState.hpp
@@ -5,7 +5,13 @@
 #include "State.hpp"
 #include "UnloadState.hpp"
 #include "../ai/Spawner.hpp"
+#include "../graphics/SkyBox.hpp"
+#include "../model/Skeletons.hpp"
 #include "../ui/Interface.hpp"
+#include "../world/BlockTypeRegistry.hpp"
+#include "../world/ChunkLoader.hpp"
+#include "../world/ChunkRenderer.hpp"
+#include "../world/Generator.hpp"
 #include "../world/World.hpp"
 
 
@@ -19,6 +25,7 @@ class WorldState
 public:
 	WorldState(
 		Environment &,
+		const Generator::Config &,
 		const Interface::Config &,
 		const World::Config &,
 		const WorldSave &
@@ -35,9 +42,16 @@ public:
 
 private:
 	Environment &env;
+	BlockTypeRegistry block_types;
 	World world;
-	Spawner spawner;
 	Interface interface;
+	Generator generator;
+	ChunkLoader chunk_loader;
+	ChunkRenderer chunk_renderer;
+	Skeletons skeletons;
+	Spawner spawner;
+
+	SkyBox sky;
 
 	PreloadState preload;
 	UnloadState unload;