X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2FWorldState.hpp;h=d5eac1980d850a9ce31b98ef8988bf187bc9e9d6;hb=13e676a6e49128ebc6c63b8dd08bef51d360e8e9;hp=04bf6a84a8100a744018e0f0ba7036a87dff874f;hpb=82ec71079e4763f2b2d66c0c210e37df40c89034;p=blank.git diff --git a/src/app/WorldState.hpp b/src/app/WorldState.hpp index 04bf6a8..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 & @@ -35,9 +41,14 @@ 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; PreloadState preload; UnloadState unload;