X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fstandalone%2FMasterState.hpp;h=9e0b8e4c68e119fade7c03636bff1b71f79e30fb;hb=1c2994622a6b73f90cbd3ec9c09ffb4d7724cab4;hp=823e7f3a67ed781f1c274e5f598c004839bb8966;hpb=a50aa0f2a2fea14f5f8c56209e2ecde3088ef913;p=blank.git diff --git a/src/standalone/MasterState.hpp b/src/standalone/MasterState.hpp index 823e7f3..9e0b8e4 100644 --- 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,8 +41,10 @@ public: const World::Config &, const WorldSave & ); + ~MasterState(); - void OnEnter() override; + void OnResume() override; + void OnPause() override; void Handle(const SDL_Event &) override; void Update(int dt) override; @@ -62,7 +65,9 @@ private: BlockTypeRegistry block_types; const WorldSave &save; World world; + ChunkIndex &spawn_index; Player &player; + bool spawn_player; HUD hud; InteractiveManipulator manip; DirectInput input;