use (and fix) new shape implementation

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

diff --git a/src/standalone/MasterState.hpp b/src/standalone/MasterState.hpp
index 84c331523e43a4602a52a07d4eed6cdd7bbd22a1..680bb5e620cbaa15a9a3f6414f02ecf0c767263c 100644 (file)
--- a/src/standalone/MasterState.hpp
+++ b/src/standalone/MasterState.hpp
@@ -8,6 +8,7 @@
 #include "UnloadState.hpp"
 #include "../ai/Spawner.hpp"
 #include "../graphics/SkyBox.hpp"
+#include "../model/ShapeRegistry.hpp"
 #include "../model/Skeletons.hpp"
 #include "../ui/DirectInput.hpp"
 #include "../ui/HUD.hpp"
@@ -43,7 +44,8 @@ public:
        );
        ~MasterState();
 
-       void OnEnter() override;
+       void OnResume() override;
+       void OnPause() override;
 
        void Handle(const SDL_Event &) override;
        void Update(int dt) override;
@@ -61,11 +63,13 @@ public:
 private:
        Config &config;
        Environment &env;
+       ShapeRegistry shapes;
        BlockTypeRegistry block_types;
        const WorldSave &save;
        World world;
        ChunkIndex &spawn_index;
        Player &player;
+       bool spawn_player;
        HUD hud;
        InteractiveManipulator manip;
        DirectInput input;