Added morgue_dir as an init.txt option.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@718 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 7 insertions, 2 deletions

diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index 9e761cbb7c..9a4399be12 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -1618,6 +1618,11 @@ void game_options::read_option_line(const std::string &str, bool runscript)
         save_dir = field;
 #endif
     }
+    else if (key == "morgue_dir")
+    {
+        if (morgue_dir.empty())
+            morgue_dir = field;
+    }
     else if (key == "hp_warning")
     {
         hp_warning = atoi( field.c_str() );
@@ -2332,7 +2337,7 @@ bool parse_args( int argc, char **argv, bool rc_only )
             if (!next_is_param)
                 return (false);
             if (!rc_only)
-                SysEnv.macro_file = next_arg;
+                Options.macro_dir = next_arg;
             nextUsed = true;
             break;
 
@@ -2340,7 +2345,7 @@ bool parse_args( int argc, char **argv, bool rc_only )
             if (!next_is_param)
                 return (false);
             if (!rc_only)
-                SysEnv.morgue_dir = next_arg;
+                Options.morgue_dir = next_arg;
             nextUsed = true;
             break;