--world list

diff --git a/src/main.cpp b/src/main.cpp
index c1ed70fafc2886adbd58fd2273cfe259307d858a..ec305d4bf4b9209208201860641ce26f5432eee1 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -790,7 +790,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 (implies local game)"));
+                       "Set world path (implies local game) ('list' lists all)"));
        allowed_options.insert("worldname", ValueSpec(VALUETYPE_STRING,
                        "Set world by name (implies local game)"));
        allowed_options.insert("info", ValueSpec(VALUETYPE_FLAG,
@@ -909,6 +909,14 @@ int main(int argc, char *argv[])
                return 0;
        }
        
+       // List worlds if requested
+       if(cmd_args.exists("world") && cmd_args.get("world") == "list"){
+               dstream<<"Available worlds:"<<std::endl;
+               std::vector<WorldSpec> worldspecs = getAvailableWorlds();
+               print_worldspecs(worldspecs, dstream);
+               return 0;
+       }
+       
        // Print startup message
        infostream<<PROJECT_NAME<<
                        " with SER_FMT_VER_HIGHEST="<<(int)SER_FMT_VER_HIGHEST