diff options
| author | sapier <Sapier at GMX dot net> | 2013-11-28 21:43:06 +0100 |
|---|---|---|
| committer | sapier <Sapier at GMX dot net> | 2013-11-28 21:43:06 +0100 |
| commit | b08d7558de53325d184b3ddf0476cb84fc08d0ad (patch) | |
| tree | edcc6facaa288f16393dac4f87b7dbe799417124 /src | |
| parent | ff25218374bd1bfc65433543ceee336924a06925 (diff) | |
| download | minetest-b08d7558de53325d184b3ddf0476cb84fc08d0ad.tar.gz minetest-b08d7558de53325d184b3ddf0476cb84fc08d0ad.tar.bz2 minetest-b08d7558de53325d184b3ddf0476cb84fc08d0ad.zip | |
Split server/client port setting to avoid port number clashes in mainmenu
Diffstat (limited to 'src')
| -rw-r--r-- | src/defaultsettings.cpp | 4 | ||||
| -rw-r--r-- | src/main.cpp | 2 |
2 files changed, 2 insertions, 4 deletions
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())) |