X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fclient%2Fclient.h;fp=src%2Fclient%2Fclient.h;h=f01510ddb8f185f1bee2dcaaf2652b05737def84;hb=03d86ea0b4900cd0394649597d278d465512d629;hp=cb1227768f9d8bc6f82e674bfad38066017bf648;hpb=21323ef1ff02dd714330a8c9d8235f047e1dacf8;p=dragonfireclient.git diff --git a/src/client/client.h b/src/client/client.h index cb1227768..f01510ddb 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 #define CLIENT_CHAT_MESSAGE_LIMIT_PER_10S 10.0f @@ -127,7 +128,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(); @@ -347,8 +349,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(); @@ -460,7 +461,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 &blocks); void sendGotBlocks(const std::vector &blocks);