X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2FRuntime.hpp;h=1e660e0ac9465903bb475410fb542303425f4b00;hb=6513b55584093a86ce1e369e054263dd75c295c8;hp=65ad408d4ffffd7c1a826142f2a5a6b8734e95f5;hpb=13e676a6e49128ebc6c63b8dd08bef51d360e8e9;p=blank.git diff --git a/src/app/Runtime.hpp b/src/app/Runtime.hpp index 65ad408..1e660e0 100644 --- a/src/app/Runtime.hpp +++ b/src/app/Runtime.hpp @@ -2,8 +2,8 @@ #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" @@ -40,25 +40,22 @@ public: }; struct Config { - bool vsync = true; - bool doublebuf = true; - int multisampling = 1; - - Client::Config client = Client::Config(); - Generator::Config gen = Generator::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();