From f98d0433f9a72c09eddad319763e750e2deb19a3 Mon Sep 17 00:00:00 2001
From: proller <proller@github.com>
Date: Sat, 23 Mar 2013 17:37:50 +0400
Subject: Random guest name and finite liquid checkbox

---
 src/guiMainMenu.h | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'src/guiMainMenu.h')

diff --git a/src/guiMainMenu.h b/src/guiMainMenu.h
index a21f3b32a..fa5f19def 100644
--- a/src/guiMainMenu.h
+++ b/src/guiMainMenu.h
@@ -52,6 +52,7 @@ struct MainMenuData
 	int enable_shaders;
 	bool preload_item_visuals;
 	bool enable_particles;
+	bool liquid_finite;
 	// Server options
 	bool creative_mode;
 	bool enable_damage;
@@ -71,7 +72,13 @@ struct MainMenuData
 
 	MainMenuData():
 		// Generic
-		selected_tab(0),
+		selected_tab(
+#if USE_CURL
+		    1
+#else
+		    0
+#endif
+		),
 		// Client opts
 		fancy_trees(false),
 		smooth_lighting(false),
@@ -84,7 +91,13 @@ struct MainMenuData
 		// Actions
 		only_refresh(false),
 
-		serverlist_show_available(false)
+		serverlist_show_available(
+#if USE_CURL
+		    true
+#else
+		    false
+#endif
+)
 	{}
 };
 
-- 
cgit v1.2.3


From e17ae475cf8cec3f724bf99f6a52e49a19d99d91 Mon Sep 17 00:00:00 2001
From: PilzAdam <pilzadam@minetest.net>
Date: Sat, 30 Mar 2013 18:09:38 +0100
Subject: GUI: Make singleplayer default tab, store selected serverlist, show
 title of serverlist

---
 src/guiMainMenu.h | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

(limited to 'src/guiMainMenu.h')

diff --git a/src/guiMainMenu.h b/src/guiMainMenu.h
index fa5f19def..a594ccd41 100644
--- a/src/guiMainMenu.h
+++ b/src/guiMainMenu.h
@@ -29,6 +29,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 class IGameCallback;
 
+enum {
+	SERVERLIST_FAVORITES,
+	SERVERLIST_PUBLIC,
+};
+
 struct MainMenuData
 {
 	// These are in the native format of the gui elements
@@ -64,7 +69,7 @@ struct MainMenuData
 	std::string create_world_gameid;
 	bool only_refresh;
 
-	bool serverlist_show_available; // if false show local favorites only
+	int selected_serverlist;
 
 	std::vector<WorldSpec> worlds;
 	std::vector<SubgameSpec> games;
@@ -72,13 +77,7 @@ struct MainMenuData
 
 	MainMenuData():
 		// Generic
-		selected_tab(
-#if USE_CURL
-		    1
-#else
-		    0
-#endif
-		),
+		selected_tab(0),
 		// Client opts
 		fancy_trees(false),
 		smooth_lighting(false),
@@ -91,13 +90,7 @@ struct MainMenuData
 		// Actions
 		only_refresh(false),
 
-		serverlist_show_available(
-#if USE_CURL
-		    true
-#else
-		    false
-#endif
-)
+		selected_serverlist(SERVERLIST_FAVORITES)
 	{}
 };
 
-- 
cgit v1.2.3