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

diff --git a/src/app/WorldState.hpp b/src/app/WorldState.hpp
index d47024f..b48d1b9 100644
--- a/src/app/WorldState.hpp
+++ b/src/app/WorldState.hpp
@@ -5,9 +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"
 
 
@@ -21,6 +25,7 @@ class WorldState
 public:
 	WorldState(
 		Environment &,
+		const Generator::Config &,
 		const Interface::Config &,
 		const World::Config &,
 		const WorldSave &
@@ -39,9 +44,14 @@ private:
 	Environment &env;
 	BlockTypeRegistry block_types;
 	World world;
+	Interface interface;
+	Generator generator;
+	ChunkLoader chunk_loader;
 	ChunkRenderer chunk_renderer;
+	Skeletons skeletons;
 	Spawner spawner;
-	Interface interface;
+
+	SkyBox sky;
 
 	PreloadState preload;
 	UnloadState unload;