cleanup

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

diff --git a/src/app/Environment.hpp b/src/app/Environment.hpp
index b9dcc2900f97760f92e6948a7434619252756330..2cab6709fd46135540c8f3582267887a9123fbe0 100644 (file)
--- a/src/app/Environment.hpp
+++ b/src/app/Environment.hpp
@@ -6,6 +6,8 @@
 #include "StateControl.hpp"
 #include "../audio/Audio.hpp"
 #include "../graphics/Viewport.hpp"
+#include "../shared/MessageState.hpp"
+#include "../ui/Keymap.hpp"
 
 #include <string>
 
@@ -14,19 +16,50 @@ namespace blank {
 
 class Window;
 
-struct Environment {
+struct HeadlessEnvironment {
+
+       struct Config {
+               std::string asset_path;
+               std::string save_path;
+
+               std::string GetWorldPath(
+                       const std::string &world_name
+               ) const;
+               std::string GetWorldPath(
+                       const std::string &world_name,
+                       const std::string &hostname
+               ) const;
+       } config;
+
+       AssetLoader loader;
+
+       FrameCounter counter;
+
+       StateControl state;
+
+
+       explicit HeadlessEnvironment(const Config &);
+
+};
+
+
+struct Environment
+: public HeadlessEnvironment {
+
+       Assets assets;
 
        Audio audio;
        Viewport viewport;
        Window &window;
 
-       Assets assets;
-       FrameCounter counter;
+       Keymap keymap;
+
+       MessageState msg_state;
 
-       StateControl state;
 
+       Environment(Window &win, const Config &);
 
-       explicit Environment(Window &win, const std::string &asset_path);
+       void ShowMessage(const char *);
 
 };