Merge branch 'NetHack-3.6'

2019-11-11 14:32:09 -05:00
parent 277e6c7126 02da5f2d38
commit 900a826e8e
12 changed files with 210 additions and 153 deletions
--- a/src/options.c
+++ b/src/options.c
@@ -661,7 +661,7 @@ initoptions()

    /* ... and _must_ parse correctly. */
    if (!read_config_file(SYSCF_FILE, SET_IN_SYS)) {
-        if (config_error_done())
+        if (config_error_done() && !iflags.initoptions_noterminate)
            nh_terminate(EXIT_FAILURE);
    }
    config_error_done();