first test for actual program binary

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

diff --git a/src/app/Runtime.hpp b/src/app/Runtime.hpp
index 904431b021bf2d346fac78e9dff5d2586ea05414..1e660e0ac9465903bb475410fb542303425f4b00 100644 (file)
--- a/src/app/Runtime.hpp
+++ b/src/app/Runtime.hpp
@@ -1,9 +1,11 @@
 #ifndef BLANK_RUNTIME_HPP_
 #define BLANK_RUNTIME_HPP_
 
-#include "../net/Client.hpp"
-#include "../net/Server.hpp"
+#include "Environment.hpp"
+#include "../client/Client.hpp"
+#include "../server/Server.hpp"
 #include "../ui/Interface.hpp"
+#include "../world/Generator.hpp"
 #include "../world/World.hpp"
 
 #include <cstddef>
@@ -38,26 +40,22 @@ public:
        };
 
        struct Config {
-               bool vsync = true;
-               bool doublebuf = true;
-               int multisampling = 1;
-
-               std::string asset_path;
-               std::string save_path;
-
-               Client::Config client = Client::Config();
-               Interface::Config interface = Interface::Config();
-               Server::Config server = Server::Config();
+               blank::Config game = blank::Config();
+               HeadlessEnvironment::Config env = HeadlessEnvironment::Config();
+               Generator::Config gen = Generator::Config();
                World::Config world = World::Config();
        };
 
        Runtime() noexcept;
 
-       void ReadArgs(int argc, const char *const *argv);
+       void Initialize(int argc, const char *const *argv);
 
        int Execute();
 
 private:
+       void ReadArgs(int argc, const char *const *argv);
+       void ReadPreferences();
+
        void RunStandalone();
        void RunServer();
        void RunClient();