diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-11-03 12:08:53 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-11-03 12:08:53 +0000 |
| commit | 18841980cc1fcfaea4dc2b7689441a28d2d7054c (patch) | |
| tree | c7fba714f4716abeecc17f60ebb36aa03e93d2e1 | |
| parent | 1629d46baaf39a1ce8767a67b1b9f9b46b6e4318 (diff) | |
| download | crawl-ref-18841980cc1fcfaea4dc2b7689441a28d2d7054c.tar.gz crawl-ref-18841980cc1fcfaea4dc2b7689441a28d2d7054c.zip | |
Fixed -morgue option not creating morgue directory (V-Napkin).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.3@2729 c06c8d41-db1a-0410-9941-cceddc491573
| -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 08cdfd212b..e40581271f 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 e07ce2b9d6..6560462c32 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); } |