X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2FguiMainMenu.h;h=711ad10f8fd61afaa2bddfce2605c34961093d88;hb=d1df09841d0eac7a88f638676b80ec848522cca5;hp=fa3d83c45e167dcd704677fff99ab5a00cf58a28;hpb=9f031a67594162a53b07acbfbc65faf8c4938e99;p=dragonfireclient.git

diff --git a/src/guiMainMenu.h b/src/guiMainMenu.h
index fa3d83c45..711ad10f8 100644
--- 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
@@ -24,91 +24,45 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #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;
+struct MainMenuDataForScript {
+
+	MainMenuDataForScript() :
+		reconnect_requested(false)
+	{}
+
+	// Whether the server has requested a reconnect
+	bool reconnect_requested;
+
+	std::string errormessage;
+};
+
+struct MainMenuData {
 	// 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;
+	std::string servername;
+	std::string serverdescription;
+	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;
 
-	std::vector<WorldSpec> worlds;
-	std::vector<SubgameSpec> games;
+	// 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)
+		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();
-	
-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;
-};
-
 #endif