merge common parts of pre- and unload states

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

diff --git a/src/client/MasterState.hpp b/src/client/MasterState.hpp
index ff1769fdecf6f4db622b3c5c6579be5222210c85..1d69998b58f3432f656a78906142704384977921 100644 (file)
--- a/src/client/MasterState.hpp
+++ b/src/client/MasterState.hpp
@@ -1,12 +1,14 @@
 #ifndef BLANK_CLIENT_CLIENTSTATE_HPP_
 #define BLANK_CLIENT_CLIENTSTATE_HPP_
 
-#include "InitialState.hpp"
-#include "InteractiveState.hpp"
 #include "../app/State.hpp"
-#include "../net/Client.hpp"
 #include "../net/ConnectionHandler.hpp"
 
+#include "Client.hpp"
+#include "InitialState.hpp"
+#include "InteractiveState.hpp"
+#include "../app/Config.hpp"
+
 #include <map>
 #include <memory>
 
@@ -26,18 +28,18 @@ class MasterState
 public:
        MasterState(
                Environment &,
-               const World::Config &,
-               const Interface::Config &,
-               const Client::Config &
+               Config &,
+               const World::Config &
        );
 
        Client &GetClient() noexcept { return client; }
        Environment &GetEnv() noexcept { return env; }
 
+       Config &GetConfig() noexcept { return config; }
+       const Config &GetConfig() const noexcept { return config; }
+
        World::Config &GetWorldConf() noexcept { return world_conf; }
        const World::Config &GetWorldConf() const noexcept { return world_conf; }
-       const Interface::Config &GetInterfaceConf() const noexcept { return intf_conf; }
-       const Client::Config &GetClientConf() const noexcept { return client_conf; }
 
        void Quit();
 
@@ -58,6 +60,7 @@ public:
        void On(const Packet::PlayerCorrection &) override;
        void On(const Packet::ChunkBegin &) override;
        void On(const Packet::ChunkData &) override;
+       void On(const Packet::BlockUpdate &) override;
 
 private:
        /// flag entity as updated by given packet
@@ -68,9 +71,8 @@ private:
 
 private:
        Environment &env;
+       Config &config;
        World::Config world_conf;
-       const Interface::Config &intf_conf;
-       const Client::Config &client_conf;
        std::unique_ptr<InteractiveState> state;
        Client client;