X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2FWorldState.hpp;h=d5eac1980d850a9ce31b98ef8988bf187bc9e9d6;hb=38a4cffc0b6aa58e49d24c06aad7bee14cb6515d;hp=6ab613f85e88634b6dd03bf276964276330a649d;hpb=f5e5e8522b94a6b81a137d4bca7665ef15bcd2c6;p=blank.git

diff --git a/src/app/WorldState.hpp b/src/app/WorldState.hpp
index 6ab613f..d5eac19 100644
--- a/src/app/WorldState.hpp
+++ b/src/app/WorldState.hpp
@@ -5,7 +5,12 @@
 #include "State.hpp"
 #include "UnloadState.hpp"
 #include "../ai/Spawner.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 +24,7 @@ class WorldState
 public:
 	WorldState(
 		Environment &,
+		const Generator::Config &,
 		const Interface::Config &,
 		const World::Config &,
 		const WorldSave &
@@ -31,12 +37,18 @@ public:
 	void Render(Viewport &) override;
 
 	World &GetWorld() noexcept { return world; }
+	Interface &GetInterface() noexcept { return interface; }
 
 private:
 	Environment &env;
+	BlockTypeRegistry block_types;
 	World world;
-	Spawner spawner;
 	Interface interface;
+	Generator generator;
+	ChunkLoader chunk_loader;
+	ChunkRenderer chunk_renderer;
+	Skeletons skeletons;
+	Spawner spawner;
 
 	PreloadState preload;
 	UnloadState unload;