X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2Fruntime.cpp;h=8ce7b5dd59562fa989487ae635cc266849939349;hb=13e676a6e49128ebc6c63b8dd08bef51d360e8e9;hp=2f0f82ec1522e845602236aa32cf745d0cfc90f6;hpb=9ebe2c320fd9f94266ab93fa2f9d9908a0a284d3;p=blank.git

diff --git a/src/app/runtime.cpp b/src/app/runtime.cpp
index 2f0f82e..8ce7b5d 100644
--- a/src/app/runtime.cpp
+++ b/src/app/runtime.cpp
@@ -1,11 +1,11 @@
 #include "Application.hpp"
-#include "ClientState.hpp"
 #include "Environment.hpp"
 #include "Runtime.hpp"
 #include "ServerState.hpp"
 #include "WorldState.hpp"
 
 #include "init.hpp"
+#include "../client/MasterState.hpp"
 #include "../io/filesystem.hpp"
 #include "../io/WorldSave.hpp"
 
@@ -47,15 +47,24 @@ string default_save_path() {
 
 namespace blank {
 
-HeadlessEnvironment::HeadlessEnvironment(const string &asset_path)
-: loader(asset_path)
+HeadlessEnvironment::HeadlessEnvironment(const Config &config)
+: config(config)
+, loader(config.asset_path)
 , counter()
 , state() {
 
 }
 
-Environment::Environment(Window &win, const string &asset_path)
-: HeadlessEnvironment(asset_path)
+string HeadlessEnvironment::Config::GetWorldPath(const string &world_name) const {
+	return save_path + "worlds/" + world_name + '/';
+}
+
+string HeadlessEnvironment::Config::GetWorldPath(const string &world_name, const string &host_name) const {
+	return save_path + "cache/" + host_name + '/' + world_name + '/';
+}
+
+Environment::Environment(Window &win, const Config &config)
+: HeadlessEnvironment(config)
 , assets(loader)
 , audio()
 , viewport()
@@ -64,6 +73,15 @@ Environment::Environment(Window &win, const string &asset_path)
 	viewport.Clear();
 	window.Flip();
 	keymap.LoadDefault();
+
+	string keys_path = config.save_path + "keys.conf";
+	if (!is_file(keys_path)) {
+		std::ofstream file(keys_path);
+		keymap.Save(file);
+	} else {
+		std::ifstream file(keys_path);
+		keymap.Load(file);
+	}
 }
 
 
@@ -123,7 +141,7 @@ void Runtime::ReadArgs(int argc, const char *const *argv) {
 							cerr << "missing argument to --asset-path" << endl;
 							error = true;
 						} else {
-							config.asset_path = argv[i];
+							config.env.asset_path = argv[i];
 						}
 					} else if (strcmp(param, "host") == 0) {
 						++i;
@@ -142,13 +160,21 @@ void Runtime::ReadArgs(int argc, const char *const *argv) {
 							config.server.port = strtoul(argv[i], nullptr, 10);
 							config.client.port = config.server.port;
 						}
+					} else if (strcmp(param, "player-name") == 0) {
+						++i;
+						if (i >= argc || argv[i] == nullptr || argv[i][0] == '\0') {
+							cerr << "missing argument to --player-name" << endl;
+							error = true;
+						} else {
+							config.interface.player_name = argv[i];
+						}
 					} else if (strcmp(param, "save-path") == 0) {
 						++i;
 						if (i >= argc || argv[i] == nullptr || argv[i][0] == '\0') {
 							cerr << "missing argument to --save-path" << endl;
 							error = true;
 						} else {
-							config.save_path = argv[i];
+							config.env.save_path = argv[i];
 						}
 					} else if (strcmp(param, "world-name") == 0) {
 						++i;
@@ -156,7 +182,7 @@ void Runtime::ReadArgs(int argc, const char *const *argv) {
 							cerr << "missing argument to --world-name" << endl;
 							error = true;
 						} else {
-							config.world_name = argv[i];
+							config.world.name = argv[i];
 						}
 					} else {
 						cerr << "unknown option " << arg << endl;
@@ -194,7 +220,7 @@ void Runtime::ReadArgs(int argc, const char *const *argv) {
 								cerr << "missing argument to -s" << endl;
 								error = true;
 							} else {
-								config.world.gen.seed = strtoul(argv[i], nullptr, 10);
+								config.gen.seed = strtoul(argv[i], nullptr, 10);
 							}
 							break;
 						case 't':
@@ -229,21 +255,21 @@ void Runtime::ReadArgs(int argc, const char *const *argv) {
 		return;
 	}
 
-	if (config.asset_path.empty()) {
-		config.asset_path = default_asset_path();
+	if (config.env.asset_path.empty()) {
+		config.env.asset_path = default_asset_path();
 	} else if (
-		config.asset_path[config.asset_path.size() - 1] != '/' &&
-		config.asset_path[config.asset_path.size() - 1] != '\\'
+		config.env.asset_path[config.env.asset_path.size() - 1] != '/' &&
+		config.env.asset_path[config.env.asset_path.size() - 1] != '\\'
 	) {
-		config.asset_path += '/';
+		config.env.asset_path += '/';
 	}
-	if (config.save_path.empty()) {
-		config.save_path = default_save_path();
+	if (config.env.save_path.empty()) {
+		config.env.save_path = default_save_path();
 	} else if (
-		config.save_path[config.save_path.size() - 1] != '/' &&
-		config.save_path[config.save_path.size() - 1] != '\\'
+		config.env.save_path[config.env.save_path.size() - 1] != '/' &&
+		config.env.save_path[config.env.save_path.size() - 1] != '\\'
 	) {
-		config.save_path += '/';
+		config.env.save_path += '/';
 	}
 
 	if (n > 0) {
@@ -285,43 +311,38 @@ int Runtime::Execute() {
 void Runtime::RunStandalone() {
 	Init init(config.doublebuf, config.multisampling);
 
-	Environment env(init.window, config.asset_path);
+	Environment env(init.window, config.env);
 	env.viewport.VSync(config.vsync);
 
-	WorldSave save(config.save_path + config.world_name + '/');
+	WorldSave save(config.env.GetWorldPath(config.world.name));
 	if (save.Exists()) {
 		save.Read(config.world);
+		save.Read(config.gen);
 	} else {
 		save.Write(config.world);
-	}
-
-	std::string keys_path = config.save_path + "keys.conf";
-	if (!is_file(keys_path)) {
-		std::ofstream file(keys_path);
-		env.keymap.Save(file);
-	} else {
-		std::ifstream file(keys_path);
-		env.keymap.Load(file);
+		save.Write(config.gen);
 	}
 
 	Application app(env);
-	WorldState world_state(env, config.interface, config.world, save);
+	WorldState world_state(env, config.gen, config.interface, config.world, save);
 	app.PushState(&world_state);
 	Run(app);
 }
 
 void Runtime::RunServer() {
-	HeadlessEnvironment env(config.asset_path);
+	HeadlessEnvironment env(config.env);
 
-	WorldSave save(config.save_path + config.world_name + '/');
+	WorldSave save(config.env.GetWorldPath(config.world.name));
 	if (save.Exists()) {
 		save.Read(config.world);
+		save.Read(config.gen);
 	} else {
 		save.Write(config.world);
+		save.Write(config.gen);
 	}
 
 	HeadlessApplication app(env);
-	ServerState server_state(env, config.world, save, config.server);
+	ServerState server_state(env, config.gen, config.world, save, config.server);
 	app.PushState(&server_state);
 	Run(app);
 }
@@ -329,27 +350,11 @@ void Runtime::RunServer() {
 void Runtime::RunClient() {
 	Init init(config.doublebuf, config.multisampling);
 
-	Environment env(init.window, config.asset_path);
+	Environment env(init.window, config.env);
 	env.viewport.VSync(config.vsync);
 
-	WorldSave save(config.save_path + config.world_name + '/');
-	if (save.Exists()) {
-		save.Read(config.world);
-	} else {
-		save.Write(config.world);
-	}
-
-	std::string keys_path = config.save_path + "keys.conf";
-	if (!is_file(keys_path)) {
-		std::ofstream file(keys_path);
-		env.keymap.Save(file);
-	} else {
-		std::ifstream file(keys_path);
-		env.keymap.Load(file);
-	}
-
 	Application app(env);
-	ClientState client_state(env, config.world, save, config.client);
+	client::MasterState client_state(env, config.world, config.interface, config.client);
 	app.PushState(&client_state);
 	Run(app);
 }