aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2012-03-11 16:11:07 +0200
committerPerttu Ahola <celeron55@gmail.com>2012-03-11 16:11:07 +0200
commitbcaab74f1f4cb8c9fcd65cc8cb8bd290834bf72f (patch)
tree1013f375a58917b1b78f72def03eda71bb7973b2
parent1b670a293b2747eccd743b09fda20fbdfc1c1ad7 (diff)
downloadminetest-bcaab74f1f4cb8c9fcd65cc8cb8bd290834bf72f.tar.gz
minetest-bcaab74f1f4cb8c9fcd65cc8cb8bd290834bf72f.tar.bz2
minetest-bcaab74f1f4cb8c9fcd65cc8cb8bd290834bf72f.zip
--world implies local game
-rw-r--r--src/main.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp
index b85dee77c..73469471d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -777,7 +777,7 @@ int main(int argc, char *argv[])
allowed_options.insert("map-dir", ValueSpec(VALUETYPE_STRING,
"Same as --world (deprecated)"));
allowed_options.insert("world", ValueSpec(VALUETYPE_STRING,
- "Set world path"));
+ "Set world path (implies local game)"));
allowed_options.insert("verbose", ValueSpec(VALUETYPE_FLAG,
"Print more information to console"));
allowed_options.insert("logfile", ValueSpec(VALUETYPE_STRING,
@@ -1059,6 +1059,8 @@ int main(int argc, char *argv[])
std::string address = g_settings->get("address");
if(cmd_args.exists("address"))
address = cmd_args.get("address");
+ else if(cmd_args.exists("world"))
+ address = "";
std::string playername = g_settings->get("name");
if(cmd_args.exists("name"))