Limit speed in collisionMoveResult for avoiding hangs

[dragonfireclient.git] / src / guiMainMenu.h

diff --git a/src/guiMainMenu.h b/src/guiMainMenu.h
index 397c2f7ce13a9494c584f5615cb96c9f49de6848..a594ccd418bac8c2b9a052b5740ab6ccc1245440 100644 (file)
--- a/src/guiMainMenu.h
+++ b/src/guiMainMenu.h
@@ -1,18 +1,18 @@
 /*
-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 General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+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.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+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.
 */
@@ -20,17 +20,28 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef GUIMAINMENU_HEADER
 #define GUIMAINMENU_HEADER
 
-#include "common_irrlicht.h"
+#include "irrlichttypes_extrabloated.h"
 #include "modalMenu.h"
 #include <string>
 #include <list>
 #include "subgame.h"
+#include "serverlist.h"
+
 class IGameCallback;
 
+enum {
+       SERVERLIST_FAVORITES,
+       SERVERLIST_PUBLIC,
+};
+
 struct MainMenuData
 {
        // These are in the native format of the gui elements
+       // Generic
+       int selected_tab;
        // Client options
+       std::string servername;
+       std::string serverdescription;
        std::wstring address;
        std::wstring port;
        std::wstring name;
@@ -39,26 +50,47 @@ struct MainMenuData
        bool smooth_lighting;
        bool clouds_3d;
        bool opaque_water;
+       bool mip_map;
+       bool anisotropic_filter;
+       bool bilinear_filter;
+       bool trilinear_filter;
+       int enable_shaders;
+       bool preload_item_visuals;
+       bool enable_particles;
+       bool liquid_finite;
        // Server options
        bool creative_mode;
        bool enable_damage;
+       bool enable_public;
        int selected_world;
+       bool simple_singleplayer_mode;
        // Actions
-       WorldSpec delete_world_spec;
        std::wstring create_world_name;
        std::string create_world_gameid;
+       bool only_refresh;
+
+       int selected_serverlist;
 
        std::vector<WorldSpec> worlds;
        std::vector<SubgameSpec> games;
+       std::vector<ServerListSpec> servers;
 
        MainMenuData():
+               // Generic
+               selected_tab(0),
                // Client opts
                fancy_trees(false),
                smooth_lighting(false),
                // Server opts
                creative_mode(false),
                enable_damage(false),
-               selected_world(0)
+               enable_public(false),
+               selected_world(0),
+               simple_singleplayer_mode(false),
+               // Actions
+               only_refresh(false),
+
+               selected_serverlist(SERVERLIST_FAVORITES)
        {}
 };
 
@@ -82,8 +114,9 @@ class GUIMainMenu : public GUIModalMenu
        { return m_accepted; }
        bool OnEvent(const SEvent& event);
        void createNewWorld(std::wstring name, std::string gameid);
-       void deleteWorld(WorldSpec spec);
+       void deleteWorld(const std::vector<std::string> &paths);
        int getTab();
+       void displayMessageMenu(std::wstring msg);
        
 private:
        MainMenuData *m_data;
@@ -94,12 +127,15 @@ class GUIMainMenu : public GUIModalMenu
        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;
+       void updateGuiServerList();
+       void serverListOnSelected();
+       ServerListSpec getServerListSpec(std::string address, std::string port);
 };
 
 #endif