X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2FguiMainMenu.h;h=711ad10f8fd61afaa2bddfce2605c34961093d88;hb=dd0a058e1fc74f37605022b52fa1f6b04086bbbf;hp=a21f3b32acb4801f24e51790859b8b8bd726fb11;hpb=22e186b4aa88b585e71500c4e9a03bf69b0b6191;p=minetest.git

diff --git a/src/guiMainMenu.h b/src/guiMainMenu.h
index a21f3b32a..711ad10f8 100644
--- a/src/guiMainMenu.h
+++ b/src/guiMainMenu.h
@@ -24,113 +24,45 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "modalMenu.h"
 #include <string>
 #include <list>
-#include "subgame.h"
-#include "serverlist.h"
 
-class IGameCallback;
+struct MainMenuDataForScript {
 
-struct MainMenuData
-{
-	// These are in the native format of the gui elements
-	// Generic
-	int selected_tab;
+	MainMenuDataForScript() :
+		reconnect_requested(false)
+	{}
+
+	// Whether the server has requested a reconnect
+	bool reconnect_requested;
+
+	std::string errormessage;
+};
+
+struct MainMenuData {
 	// 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;
+	std::string address;
+	std::string port;
+	std::string name;
+	std::string password;
+	// Whether to reconnect
+	bool do_reconnect;
+
 	// Server options
-	bool creative_mode;
-	bool enable_damage;
 	bool enable_public;
 	int selected_world;
 	bool simple_singleplayer_mode;
-	// Actions
-	std::wstring create_world_name;
-	std::string create_world_gameid;
-	bool only_refresh;
 
-	bool serverlist_show_available; // if false show local favorites only
-
-	std::vector<WorldSpec> worlds;
-	std::vector<SubgameSpec> games;
-	std::vector<ServerListSpec> servers;
+	// Data to be passed to the script
+	MainMenuDataForScript script_data;
 
 	MainMenuData():
-		// Generic
-		selected_tab(0),
-		// Client opts
-		fancy_trees(false),
-		smooth_lighting(false),
-		// Server opts
-		creative_mode(false),
-		enable_damage(false),
+		do_reconnect(false),
 		enable_public(false),
 		selected_world(0),
-		simple_singleplayer_mode(false),
-		// Actions
-		only_refresh(false),
-
-		serverlist_show_available(false)
+		simple_singleplayer_mode(false)
 	{}
 };
 
-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;
-
-	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;
-	void updateGuiServerList();
-	void serverListOnSelected();
-	ServerListSpec getServerListSpec(std::string address, std::string port);
-};
-
 #endif