enhanced application state control

[blank.git] / src / app / runtime.cpp

diff --git a/src/app/runtime.cpp b/src/app/runtime.cpp
index 5dce72159a439203843581f84cb14fc86fdda08a..85d8280987b8459f3e50fbaac37d026a5924a92a 100644 (file)
--- a/src/app/runtime.cpp
+++ b/src/app/runtime.cpp
@@ -1,10 +1,10 @@
 #include "Application.hpp"
 #include "Environment.hpp"
-#include "PreloadState.hpp"
 #include "Runtime.hpp"
 #include "WorldState.hpp"
 
 #include "init.hpp"
+#include "../world/WorldSave.hpp"
 
 #include <cctype>
 #include <cstdlib>
@@ -112,6 +112,14 @@ void Runtime::ReadArgs(int argc, const char *const *argv) {
                                                } else {
                                                        config.save_path = argv[i];
                                                }
+                                       } else if (strcmp(param, "world-name") == 0) {
+                                               ++i;
+                                               if (i >= argc || argv[i] == nullptr || argv[i][0] == '\0') {
+                                                       cerr << "missing argument to --world-name" << endl;
+                                                       error = true;
+                                               } else {
+                                                       config.world_name = argv[i];
+                                               }
                                        } else {
                                                cerr << "unknown option " << arg << endl;
                                                error = true;
@@ -148,8 +156,7 @@ void Runtime::ReadArgs(int argc, const char *const *argv) {
                                                                cerr << "missing argument to -s" << endl;
                                                                error = true;
                                                        } else {
-                                                               config.world.gen.solid_seed = strtoul(argv[i], nullptr, 10);
-                                                               config.world.gen.type_seed = config.world.gen.solid_seed;
+                                                               config.world.gen.seed = strtoul(argv[i], nullptr, 10);
                                                        }
                                                        break;
                                                case 't':
@@ -224,14 +231,18 @@ int Runtime::Execute() {
        Environment env(init.window, config.asset_path);
        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);
+       }
+
        Application app(env);
 
-       WorldState world_state(env, config.interface, config.world);
+       WorldState world_state(env, config.interface, config.world, save);
        app.PushState(&world_state);
 
-       PreloadState preloader(env, world_state.GetWorld().Loader());
-       app.PushState(&preloader);
-
        switch (mode) {
                default:
                case NORMAL: