diff options
author | SmallJoker <SmallJoker@users.noreply.github.com> | 2020-07-14 19:10:37 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-14 19:10:37 +0200 |
commit | 4fa1e03f6844a24fc4b37f22e7264957b2a71d06 (patch) | |
tree | 0de95205bbe4b2123d87583a5e9639817b39824c /src/gameparams.h | |
parent | 2bec83eec0dc2de2d6b8fb0b827e94807ed9b0b8 (diff) | |
download | hax-minetest-server-4fa1e03f6844a24fc4b37f22e7264957b2a71d06.tar.gz hax-minetest-server-4fa1e03f6844a24fc4b37f22e7264957b2a71d06.zip |
Cleanup ClientLauncher structure (#10160)
Remove duplicated variables and unify the startup data into a new (inherited) struct.
Diffstat (limited to 'src/gameparams.h')
-rw-r--r-- | src/gameparams.h | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/src/gameparams.h b/src/gameparams.h index 28794a649..70b0ffcde 100644 --- a/src/gameparams.h +++ b/src/gameparams.h @@ -23,10 +23,29 @@ with this program; if not, write to the Free Software Foundation, Inc., struct SubgameSpec; +// Information provided from "main" struct GameParams { + GameParams() = default; + u16 socket_port; std::string world_path; SubgameSpec game_spec; bool is_dedicated_server; }; + +// Information processed by main menu +struct GameStartData : GameParams +{ + GameStartData() = default; + + bool isSinglePlayer() const { return address.empty() && !local_server; } + + std::string name; + std::string password; + std::string address; + bool local_server; + + // "world_path" must be kept in sync! + WorldSpec world_spec; +}; |