Code modernization: src/m* (part 2)

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

diff --git a/src/guiMainMenu.h b/src/guiMainMenu.h
index 715deb47d015cb565d1a31285dbd6c824ce24734..43a3b1a33e851cc20fd63430dddf42340d71ab94 100644 (file)
--- a/src/guiMainMenu.h
+++ b/src/guiMainMenu.h
@@ -1,6 +1,6 @@
 /*
-Minetest-c55
-Copyright (C) 2010-2012 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 Lesser General Public License as published by
@@ -17,99 +17,39 @@ 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
+#pragma once
 
 #include "irrlichttypes_extrabloated.h"
 #include "modalMenu.h"
 #include <string>
 #include <list>
-#include "subgame.h"
-class IGameCallback;
 
-struct MainMenuData
-{
-       // These are in the native format of the gui elements
-       // Generic
-       int selected_tab;
-       // Client options
-       std::wstring address;
-       std::wstring port;
-       std::wstring name;
-       std::wstring password;
-       bool fancy_trees;
-       bool smooth_lighting;
-       bool clouds_3d;
-       bool opaque_water;
-       // Server options
-       bool creative_mode;
-       bool enable_damage;
-       int selected_world;
-       bool simple_singleplayer_mode;
-       // Actions
-       std::wstring create_world_name;
-       std::string create_world_gameid;
-       bool only_refresh;
+struct MainMenuDataForScript {
 
-       std::vector<WorldSpec> worlds;
-       std::vector<SubgameSpec> games;
+       MainMenuDataForScript() = default;
 
-       MainMenuData():
-               // Generic
-               selected_tab(0),
-               // Client opts
-               fancy_trees(false),
-               smooth_lighting(false),
-               // Server opts
-               creative_mode(false),
-               enable_damage(false),
-               selected_world(0),
-               simple_singleplayer_mode(false),
-               // Actions
-               only_refresh(false)
-       {}
+       // Whether the server has requested a reconnect
+       bool reconnect_requested = false;
+       std::string errormessage = "";
 };
 
-class GUIMainMenu : public GUIModalMenu
-{
-public:
-       GUIMainMenu(gui::IGUIEnvironment* env,
-                       gui::IGUIElement* parent, s32 id,
-                       IMenuManager *menumgr,
-                       MainMenuData *data,
-                       IGameCallback *gamecallback);
-       ~GUIMainMenu();
-       
-       void removeChildren();
-       // Remove and re-add (or reposition) stuff
-       void regenerateGui(v2u32 screensize);
-       void drawMenu();
-       void readInput(MainMenuData *dst);
-       void acceptInput();
-       bool getStatus()
-       { return m_accepted; }
-       bool OnEvent(const SEvent& event);
-       void createNewWorld(std::wstring name, std::string gameid);
-       void deleteWorld(const std::vector<std::string> &paths);
-       int getTab();
-       void displayMessageMenu(std::wstring msg);
-       
-private:
-       MainMenuData *m_data;
-       bool m_accepted;
-       IGameCallback *m_gamecallback;
+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 = false;
 
-       gui::IGUIEnvironment* env;
-       gui::IGUIElement* parent;
-       s32 id;
-       IMenuManager *menumgr;
-       
-       bool m_is_regenerating;
-       v2s32 m_topleft_client;
-       v2s32 m_size_client;
-       v2s32 m_topleft_server;
-       v2s32 m_size_server;
-};
+       // Server options
+       int selected_world = 0;
+       bool simple_singleplayer_mode = false;
 
-#endif
+       // Data to be passed to the script
+       MainMenuDataForScript script_data;
 
+       MainMenuData() = default;
+};