X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2FRuntime.hpp;h=2d169d0149abbcddf69ee8321f121484f783b7f5;hb=b066e776622f96e906600a0c4a08de392bd03676;hp=2fdf2e5b0ba2880db1af94f2da8d9560d9db52c8;hpb=b7d09e1e35ef90282c97509e0020b20db3c7ea9f;p=blank.git

diff --git a/src/app/Runtime.hpp b/src/app/Runtime.hpp
index 2fdf2e5..2d169d0 100644
--- a/src/app/Runtime.hpp
+++ b/src/app/Runtime.hpp
@@ -1,36 +1,71 @@
 #ifndef BLANK_RUNTIME_HPP_
 #define BLANK_RUNTIME_HPP_
 
-#include "Application.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>
+#include <string>
 
 
 namespace blank {
 
+class HeadlessApplication;
+
+/// Parse and interpret arguemnts, then set up the environment and execute.
 class Runtime {
 
 public:
 	enum Mode {
+		/// default behaviour: run until user quits, dynamic timesteps
 		NORMAL,
+		/// quit after n frames
 		FRAME_LIMIT,
+		/// quit after n milliseconds
 		TIME_LIMIT,
+		/// quit after n frames, use fixed timestap
 		FIXED_FRAME_LIMIT,
+		/// display error message and quit with failure
 		ERROR,
 	};
 
+	enum Target {
+		STANDALONE,
+		SERVER,
+		CLIENT,
+	};
+
+	struct 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);
 
 	int Execute();
 
+private:
+	void RunStandalone();
+	void RunServer();
+	void RunClient();
+
+	void Run(HeadlessApplication &);
+
 private:
 	const char *name;
 	Mode mode;
+	Target target;
 	std::size_t n;
 	std::size_t t;
-	Application::Config config;
+	Config config;
 
 };