Merge branch 'master' into 7drl2016

[plomrogue] / server / utils.py

diff --git a/server/utils.py b/server/utils.py
index 43ca9f28660d7a1963d720a40a475e51bdd4c32f..f7128916f37abbef0fb4136c9123c450fc233740 100644 (file)
--- a/server/utils.py
+++ b/server/utils.py
@@ -98,11 +98,13 @@ def parse_command_line_arguments():
     """Return settings values read from command line arguments."""
     import argparse
     parser = argparse.ArgumentParser()
+    parser.add_argument('-n', dest='new', action='store_true')
     parser.add_argument('-s', nargs='?', type=int, dest='replay', const=1,
                         action='store')
     parser.add_argument('-l', nargs="?", const="save", dest='savefile',
                         action="store")
-    parser.add_argument('-w', type=str, default="confserver/world",
+    parser.add_argument('-w', type=str,
+                        default="confserver/TheCrawlingEater",
                         dest='worldconf', action='store')
     parser.add_argument('-v', dest='verbose', action='store_true')
     opts, unknown = parser.parse_known_args()