diff options
| -rw-r--r-- | crawl-ref/source/chardump.cc | 1 | ||||
| -rw-r--r-- | crawl-ref/source/initfile.cc | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/crawl-ref/source/chardump.cc b/crawl-ref/source/chardump.cc index 5af5ea01d2..f514b94d79 100644 --- a/crawl-ref/source/chardump.cc +++ b/crawl-ref/source/chardump.cc @@ -1122,7 +1122,6 @@ const char *hunger_level(void) static std::string morgue_directory() { std::string dir = - !SysEnv.morgue_dir.empty() ? SysEnv.morgue_dir : !Options.morgue_dir.empty()? Options.morgue_dir : !SysEnv.crawl_dir.empty() ? SysEnv.crawl_dir : ""; diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc index 44bc654111..5903201114 100644 --- a/crawl-ref/source/initfile.cc +++ b/crawl-ref/source/initfile.cc @@ -1309,6 +1309,9 @@ void game_options::fixup_options() if (!check_dir("Save directory", save_dir)) end(1); + if (!SysEnv.morgue_dir.empty()) + morgue_dir = SysEnv.morgue_dir; + if (!check_dir("Morgue directory", morgue_dir)) end(1); } |