sfence
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Drop GUIConfirmRegistration::m_address unused field

master
Loïc Blot 2019-03-12 16:53:21 +01:00
parent 38f6e7a198
commit e22a69d61a
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/game.cpp
View File

@ -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;

4
src/gui/guiConfirmRegistration.cpp
View File

@ -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;

3
src/gui/guiConfirmRegistration.h
View File

@ -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"";
};