X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2FRuntime.hpp;h=1e660e0ac9465903bb475410fb542303425f4b00;hb=4727825186798902f68df5b99a6a32f0ef618454;hp=10a0e55cb559365366c29c090c2dc29bfb67778f;hpb=1afc887a2040dfdedfa66913e94ff7a9634f648f;p=blank.git

diff --git a/src/app/Runtime.hpp b/src/app/Runtime.hpp
index 10a0e55..1e660e0 100644
--- a/src/app/Runtime.hpp
+++ b/src/app/Runtime.hpp
@@ -2,9 +2,10 @@
 #define BLANK_RUNTIME_HPP_
 
 #include "Environment.hpp"
-#include "../net/Client.hpp"
-#include "../net/Server.hpp"
+#include "../client/Client.hpp"
+#include "../server/Server.hpp"
 #include "../ui/Interface.hpp"
+#include "../world/Generator.hpp"
 #include "../world/World.hpp"
 
 #include <cstddef>
@@ -39,24 +40,22 @@ public:
 	};
 
 	struct Config {
-		bool vsync = true;
-		bool doublebuf = true;
-		int multisampling = 1;
-
-		Client::Config client = Client::Config();
+		blank::Config game = blank::Config();
 		HeadlessEnvironment::Config env = HeadlessEnvironment::Config();
-		Interface::Config interface = Interface::Config();
-		Server::Config server = Server::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();