merge common parts of pre- and unload states

[blank.git] / src / standalone / MasterState.hpp

diff --git a/src/standalone/MasterState.hpp b/src/standalone/MasterState.hpp
index f2c702fb2033df38fbfe39df28e1ac930760e5f8..84c331523e43a4602a52a07d4eed6cdd7bbd22a1 100644 (file)
--- a/src/standalone/MasterState.hpp
+++ b/src/standalone/MasterState.hpp
@@ -14,6 +14,7 @@
 #include "../ui/InteractiveManipulator.hpp"
 #include "../ui/Interface.hpp"
 #include "../world/BlockTypeRegistry.hpp"
+#include "../world/ChunkIndex.hpp"
 #include "../world/ChunkLoader.hpp"
 #include "../world/ChunkRenderer.hpp"
 #include "../world/Generator.hpp"
@@ -40,6 +41,7 @@ public:
                const World::Config &,
                const WorldSave &
        );
+       ~MasterState();
 
        void OnEnter() override;
 
@@ -60,7 +62,9 @@ private:
        Config &config;
        Environment &env;
        BlockTypeRegistry block_types;
+       const WorldSave &save;
        World world;
+       ChunkIndex &spawn_index;
        Player &player;
        HUD hud;
        InteractiveManipulator manip;