diff options
| author | Loïc Blot <loic.blot@unix-experience.fr> | 2019-03-12 16:53:21 +0100 |
|---|---|---|
| committer | Loïc Blot <loic.blot@unix-experience.fr> | 2019-03-12 16:53:21 +0100 |
| commit | e22a69d61a04624fe1eca818740b90dbb958e658 (patch) | |
| tree | c86907e0a05b2d146d031c712b93c1aaef1332f8 /src | |
| parent | 38f6e7a1981a8dcba9bfa9aa32ca77cd19a960aa (diff) | |
| download | minetest-e22a69d61a04624fe1eca818740b90dbb958e658.tar.gz minetest-e22a69d61a04624fe1eca818740b90dbb958e658.tar.bz2 minetest-e22a69d61a04624fe1eca818740b90dbb958e658.zip | |
Drop GUIConfirmRegistration::m_address unused field
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/game.cpp | 2 | ||||
| -rw-r--r-- | src/gui/guiConfirmRegistration.cpp | 4 | ||||
| -rw-r--r-- | src/gui/guiConfirmRegistration.h | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/client/game.cpp b/src/client/game.cpp index 37680dda3..192c899d9 100644 --- a/src/client/game.cpp +++ b/src/client/game.cpp @@ -1545,7 +1545,7 @@ bool Game::connectToServer(const std::string &playername, } else { registration_confirmation_shown = true; (new GUIConfirmRegistration(guienv, guienv->getRootGUIElement(), -1, - &g_menumgr, client, playername, password, *address, connection_aborted))->drop(); + &g_menumgr, client, playername, password, connection_aborted))->drop(); } } else { wait_time += dtime; diff --git a/src/gui/guiConfirmRegistration.cpp b/src/gui/guiConfirmRegistration.cpp index 6e6b7ad16..65c062aa5 100644 --- a/src/gui/guiConfirmRegistration.cpp +++ b/src/gui/guiConfirmRegistration.cpp @@ -38,10 +38,10 @@ const int ID_cancel = 265; GUIConfirmRegistration::GUIConfirmRegistration(gui::IGUIEnvironment *env, gui::IGUIElement *parent, s32 id, IMenuManager *menumgr, Client *client, const std::string &playername, const std::string &password, - const std::string &address, bool *aborted) : + bool *aborted) : GUIModalMenu(env, parent, id, menumgr), m_client(client), m_playername(playername), m_password(password), - m_address(address), m_aborted(aborted) + m_aborted(aborted) { #ifdef __ANDROID__ m_touchscreen_visible = false; diff --git a/src/gui/guiConfirmRegistration.h b/src/gui/guiConfirmRegistration.h index 2f2066c21..42c07e4ed 100644 --- a/src/gui/guiConfirmRegistration.h +++ b/src/gui/guiConfirmRegistration.h @@ -32,7 +32,7 @@ public: GUIConfirmRegistration(gui::IGUIEnvironment *env, gui::IGUIElement *parent, s32 id, IMenuManager *menumgr, Client *client, const std::string &playername, const std::string &password, - const std::string &address, bool *aborted); + bool *aborted); ~GUIConfirmRegistration(); void removeChildren(); @@ -61,7 +61,6 @@ private: Client *m_client = nullptr; const std::string &m_playername; const std::string &m_password; - const std::string &m_address; bool *m_aborted = nullptr; std::wstring m_pass_confirm = L""; }; |