diff options
| author | Elias Fleckenstein <eliasfleckenstein@web.de> | 2022-06-07 03:19:05 +0200 |
|---|---|---|
| committer | Elias Fleckenstein <eliasfleckenstein@web.de> | 2022-06-07 03:19:05 +0200 |
| commit | b11c0a6721cd884d78b38b63797dfdb933004e03 (patch) | |
| tree | 629c49cda2995fafef2bf345abf31b39bd21ff69 /src/client/client.h | |
| parent | 827b9f8d7054158b058679999d77c1345162a293 (diff) | |
| parent | edc7df54801ab3bf30f96ac5aad6ce11a102f6b9 (diff) | |
| download | dragonfireclient-b11c0a6721cd884d78b38b63797dfdb933004e03.tar.xz | |
Merge branch 'master' of https://github.com/minetest/minetest
Diffstat (limited to 'src/client/client.h')
| -rw-r--r-- | src/client/client.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/client/client.h b/src/client/client.h index d49f2f9ad..c1b8cfbaa 100644 --- a/src/client/client.h +++ b/src/client/client.h @@ -37,6 +37,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "mesh_generator_thread.h" #include "network/address.h" #include "network/peerhandler.h" +#include "gameparams.h" #include <fstream> #define CLIENT_CHAT_MESSAGE_LIMIT_PER_10S 10.0f @@ -126,7 +127,8 @@ public: MtEventManager *event, RenderingEngine *rendering_engine, bool ipv6, - GameUI *game_ui + GameUI *game_ui, + ELoginRegister allow_login_or_register ); ~Client(); @@ -348,8 +350,7 @@ public: u16 getProtoVersion() { return m_proto_ver; } - void confirmRegistration(); - bool m_is_registration_confirmation_state = false; + ELoginRegister m_allow_login_or_register = ELoginRegister::Any; bool m_simple_singleplayer_mode; float mediaReceiveProgress(); @@ -467,7 +468,6 @@ private: static AuthMechanism choseAuthMech(const u32 mechs); void sendInit(const std::string &playerName); - void promptConfirmRegistration(AuthMechanism chosen_auth_mechanism); void startAuth(AuthMechanism chosen_auth_mechanism); void sendDeletedBlocks(std::vector<v3s16> &blocks); void sendGotBlocks(const std::vector<v3s16> &blocks); |