Merge branch 'master' of https://github.com/minetest/minetest

[dragonfireclient.git] / src / client / client.h

diff --git a/src/client/client.h b/src/client/client.h
index d49f2f9ada7392fe9426da50f89c05ba6c838d87..c1b8cfbaa0727c48e47e776cb190e438e6bdb40e 100644 (file)
--- 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 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
                        MtEventManager *event,
                        RenderingEngine *rendering_engine,
                        bool ipv6,
-                       GameUI *game_ui
+                       GameUI *game_ui,
+                       ELoginRegister allow_login_or_register
        );
 
        ~Client();
@@ -348,8 +350,7 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
        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 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
        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);