split chunk stuff

[blank.git] / src / app / WorldState.hpp

diff --git a/src/app/WorldState.hpp b/src/app/WorldState.hpp
index c0b4ce10a23829f8012d9a4c144d3d2e2a971ba4..d5eac1980d850a9ce31b98ef8988bf187bc9e9d6 100644 (file)
--- a/src/app/WorldState.hpp
+++ b/src/app/WorldState.hpp
@@ -8,7 +8,9 @@
 #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"
 
 
@@ -22,6 +24,7 @@ class WorldState
 public:
        WorldState(
                Environment &,
+               const Generator::Config &,
                const Interface::Config &,
                const World::Config &,
                const WorldSave &
@@ -40,10 +43,12 @@ private:
        Environment &env;
        BlockTypeRegistry block_types;
        World world;
+       Interface interface;
+       Generator generator;
+       ChunkLoader chunk_loader;
        ChunkRenderer chunk_renderer;
        Skeletons skeletons;
        Spawner spawner;
-       Interface interface;
 
        PreloadState preload;
        UnloadState unload;