Fix how address is logged when a wrong password is supplied

[oweals/minetest.git] / src / guiMainMenu.h

diff --git a/src/guiMainMenu.h b/src/guiMainMenu.h
index 6c028c6e5e60f18bed4a690adaa8bf28ea6affb4..711ad10f8fd61afaa2bddfce2605c34961093d88 100644 (file)
--- a/src/guiMainMenu.h
+++ b/src/guiMainMenu.h
@@ -1,109 +1,67 @@
 /*
- Minetest-c55
- Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
 
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
 
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
 
 #ifndef GUIMAINMENU_HEADER
 #define GUIMAINMENU_HEADER
 
-#include "common_irrlicht.h"
+#include "irrlichttypes_extrabloated.h"
 #include "modalMenu.h"
-#include "utility.h"
 #include <string>
-// For IGameCallback
-#include "guiPauseMenu.h"
+#include <list>
 
-enum
-{
-       GUI_ID_QUIT_BUTTON = 101,
-       GUI_ID_NAME_INPUT,
-       GUI_ID_ADDRESS_INPUT,
-       GUI_ID_PORT_INPUT,
-       GUI_ID_FANCYTREE_CB,
-       GUI_ID_SMOOTH_LIGHTING_CB,
-       GUI_ID_DAMAGE_CB,
-       GUI_ID_CREATIVE_CB,
-       GUI_ID_JOIN_GAME_BUTTON,
-       GUI_ID_CHANGE_KEYS_BUTTON,
-       GUI_ID_DELETE_MAP_BUTTON
-};
+struct MainMenuDataForScript {
 
-struct MainMenuData
-{
-       MainMenuData() :
-               // Client opts
-                               fancy_trees(false), smooth_lighting(false),
-                               // Server opts
-                               creative_mode(false), enable_damage(false),
-                               // Actions
-                               delete_map(false)
-       {
-       }
+       MainMenuDataForScript() :
+               reconnect_requested(false)
+       {}
 
-       // These are in the native format of the gui elements
+       // Whether the server has requested a reconnect
+       bool reconnect_requested;
 
-       // Client options
-       std::wstring address;
-       std::wstring port;
-       std::wstring name;
-       std::wstring password;
-       bool fancy_trees;
-       bool smooth_lighting;
-       // Server options
-       bool creative_mode;
-       bool enable_damage;
-       // If map deletion is requested, this is set to true
-       bool delete_map;
+       std::string errormessage;
 };
 
-class GUIMainMenu: public GUIModalMenu
-{
-public:
-       GUIMainMenu(gui::IGUIEnvironment* env, gui::IGUIElement* parent, s32 id,
-                       IMenuManager *menumgr, MainMenuData *data,
-                       IGameCallback *gamecallback);
-       ~GUIMainMenu();
-
-       gui::IGUIEnvironment* env;
-       gui::IGUIElement* parent;
-       s32 id;
-       IMenuManager *menumgr;
-
-       void removeChildren();
-       /*
-        Remove and re-add (or reposition) stuff
-        */
-       void regenerateGui(v2u32 screensize);
-
-       void drawMenu();
-
-       void acceptInput();
-
-       bool getStatus()
-       {
-               return m_accepted;
-       }
-
-       bool OnEvent(const SEvent& event);
+struct MainMenuData {
+       // Client options
+       std::string servername;
+       std::string serverdescription;
+       std::string address;
+       std::string port;
+       std::string name;
+       std::string password;
+       // Whether to reconnect
+       bool do_reconnect;
 
-private:
-       MainMenuData *m_data;
-       bool m_accepted;
-       IGameCallback *m_gamecallback;
+       // Server options
+       bool enable_public;
+       int selected_world;
+       bool simple_singleplayer_mode;
+
+       // Data to be passed to the script
+       MainMenuDataForScript script_data;
+
+       MainMenuData():
+               do_reconnect(false),
+               enable_public(false),
+               selected_world(0),
+               simple_singleplayer_mode(false)
+       {}
 };
 
 #endif