X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=roguelike-server;h=c8bf3f71d28f47b95d3a14631ad45c8c60c23731;hb=ffd00ccdeb2da591fe931b6c71c5abe70c3e1b97;hp=abd2f2fcdfb3a41815cb6002ccfd7e8be9b250ce;hpb=08f8592f1a1e5d340b6c2372551f0a3da28a07d8;p=plomrogue
diff --git a/roguelike-server b/roguelike-server
index abd2f2f..c8bf3f7 100755
--- a/roguelike-server
+++ b/roguelike-server
@@ -47,11 +47,10 @@ def play_game():
if os.access(io_db["path_save"], os.F_OK):
obey_lines_in_file(io_db["path_save"], "save")
else:
- if not os.access(io_db["path_worldconf"], os.F_OK):
+ if not os.access(opts.worldconf, os.F_OK):
msg = "No world config file from which to start a new world."
raise SystemExit(msg)
- obey_lines_in_file(io_db["path_worldconf"], "world config ",
- do_record=True)
+ obey_lines_in_file(opts.worldconf, "world config ", do_record=True)
obey("MAKE_WORLD " + str(int(time.time())), "in file", do_record=True)
while True:
try_worldstate_update()
@@ -77,7 +76,8 @@ try:
else:
play_game()
except SystemExit as exit:
- print("ABORTING: " + exit.args[0])
+ if len(exit.args) < 2 and exit.args[0] != 0:
+ print("ABORTING: " + str(exit.args[0]))
except:
print("SOMETHING WENT WRONG IN UNEXPECTED WAYS")
raise