#include "Application.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"
+#include "../server/ServerState.hpp"
#include <cctype>
#include <cstdlib>
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':
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);
}
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);
}
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);
+ server::ServerState server_state(env, config.gen, config.world, save, config.server);
app.PushState(&server_state);
Run(app);
}