From b08d7558de53325d184b3ddf0476cb84fc08d0ad Mon Sep 17 00:00:00 2001
From: sapier <Sapier at GMX dot net>
Date: Thu, 28 Nov 2013 21:43:06 +0100
Subject: Split server/client port setting to avoid port number clashes in
 mainmenu

---
 src/defaultsettings.cpp | 4 ++--
 src/main.cpp            | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 9df9b3aa5..df7570b33 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -25,11 +25,10 @@ void set_default_settings(Settings *settings)
 {
 	// Client and server
 
-	settings->setDefault("port", "");
 	settings->setDefault("name", "");
 
 	// Client stuff
-
+	settings->setDefault("remote_port", "30000");
 	settings->setDefault("keymap_forward", "KEY_KEY_W");
 	settings->setDefault("keymap_backward", "KEY_KEY_S");
 	settings->setDefault("keymap_left", "KEY_KEY_A");
@@ -157,6 +156,7 @@ void set_default_settings(Settings *settings)
 
 	// Server stuff
 	// "map-dir" doesn't exist by default.
+	settings->setDefault("port", "30000");
 	settings->setDefault("default_game", "minetest");
 	settings->setDefault("motd", "");
 	settings->setDefault("max_users", "15");
diff --git a/src/main.cpp b/src/main.cpp
index 9ffab816e..373e1ca96 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1674,8 +1674,6 @@ int main(int argc, char *argv[])
 
 				// Save settings
 				g_settings->set("name", playername);
-				g_settings->set("address", address);
-				g_settings->set("port", itos(port));
 
 				if((menudata.selected_world >= 0) &&
 						(menudata.selected_world < (int)worldspecs.size()))
-- 
cgit v1.2.3