X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2FguiMainMenu.h;h=a594ccd418bac8c2b9a052b5740ab6ccc1245440;hb=c03c296dc7afe0e4ded65484221072ad6715e2be;hp=87561f7974fd075dd4bea9c6fc440a5470fffcfb;hpb=014a3aea3257aadf53e50bcedd4d2da148bafea2;p=minetest.git

diff --git a/src/guiMainMenu.h b/src/guiMainMenu.h
index 87561f797..a594ccd41 100644
--- a/src/guiMainMenu.h
+++ b/src/guiMainMenu.h
@@ -1,18 +1,18 @@
 /*
-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
+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,55 +20,78 @@ 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 "utility.h"
 #include <string>
-// For IGameCallback
-#include "guiPauseMenu.h"
+#include <list>
+#include "subgame.h"
+#include "serverlist.h"
 
-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
+class IGameCallback;
+
+enum {
+	SERVERLIST_FAVORITES,
+	SERVERLIST_PUBLIC,
 };
 
 struct MainMenuData
 {
-	MainMenuData():
-		// Client opts
-		fancy_trees(false),
-		smooth_lighting(false),
-		// Server opts
-		creative_mode(false),
-		enable_damage(false),
-		// Actions
-		delete_map(false)
-	{}
-
 	// 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;
 	std::wstring password;
 	bool fancy_trees;
 	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;
-	// If map deletion is requested, this is set to true
-	bool delete_map;
+	bool enable_public;
+	int selected_world;
+	bool simple_singleplayer_mode;
+	// Actions
+	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),
+		enable_public(false),
+		selected_world(0),
+		simple_singleplayer_mode(false),
+		// Actions
+		only_refresh(false),
+
+		selected_serverlist(SERVERLIST_FAVORITES)
+	{}
 };
 
 class GUIMainMenu : public GUIModalMenu
@@ -82,21 +105,18 @@ class GUIMainMenu : public GUIModalMenu
 	~GUIMainMenu();
 	
 	void removeChildren();
-	/*
-		Remove and re-add (or reposition) stuff
-	*/
+	// Remove and re-add (or reposition) stuff
 	void regenerateGui(v2u32 screensize);
-
 	void drawMenu();
-
+	void readInput(MainMenuData *dst);
 	void acceptInput();
-
 	bool getStatus()
-	{
-		return m_accepted;
-	}
-
+	{ 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;
@@ -107,6 +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