add packet for merging player state back to client

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

diff --git a/src/app/UnloadState.hpp b/src/app/UnloadState.hpp
index 56394bb60c8105e4aee5eeb20cf4b7b26aff3b1c..ba7e8093d8a56b7eb1dfef958f224ce566720e90 100644 (file)
--- a/src/app/UnloadState.hpp
+++ b/src/app/UnloadState.hpp
@@ -1,10 +1,9 @@
-#ifndef BLANK_APP_PRELOADSTATE_HPP_
-#define BLANK_APP_PRELOADSTATE_HPP_
+#ifndef BLANK_APP_UNLOADSTATE_HPP_
+#define BLANK_APP_UNLOADSTATE_HPP_
 
 #include "State.hpp"
 
 #include "../ui/Progress.hpp"
-#include "../graphics/Font.hpp"
 
 #include <cstddef>
 #include <list>
@@ -13,14 +12,17 @@
 namespace blank {
 
 class Chunk;
-class ChunkLoader;
+class ChunkStore;
 class Environment;
+class WorldSave;
 
 class UnloadState
 : public State {
 
 public:
-       UnloadState(Environment &, ChunkLoader &);
+       UnloadState(Environment &, ChunkStore &, const WorldSave &);
+
+       void OnResume();
 
        void Handle(const SDL_Event &) override;
        void Update(int dt) override;
@@ -28,8 +30,8 @@ public:
 
 private:
        Environment &env;
-       ChunkLoader &loader;
-       Font font;
+       ChunkStore &chunks;
+       const WorldSave &save;
        Progress progress;
        std::list<Chunk>::iterator cur;
        std::list<Chunk>::iterator end;