diff options
author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-08-17 22:30:02 +0000 |
---|---|---|
committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-08-17 22:30:02 +0000 |
commit | e39198243f99fae49befe7489b3f16ad6556b835 (patch) | |
tree | 88a872fcf264d37908c7820ace37486b842da542 /crawl-ref/source/initfile.cc | |
parent | 48b1b54aaf8c7ccc2b016158f58cf34385dd5068 (diff) | |
download | crawl-ref-e39198243f99fae49befe7489b3f16ad6556b835.tar.gz crawl-ref-e39198243f99fae49befe7489b3f16ad6556b835.zip |
Fixed -morgue option being ignored when Crawl is built with Lua bindings (Marc).
Dropped generation odds of Pan demons post-Orb.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2011 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/initfile.cc')
-rw-r--r-- | crawl-ref/source/initfile.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc index c7c762b932..e084e3d546 100644 --- a/crawl-ref/source/initfile.cc +++ b/crawl-ref/source/initfile.cc @@ -530,7 +530,7 @@ void game_options::reset_options() save_dir.clear(); #endif -#ifndef SHORT_FILE_NAMES +#if !defined(SHORT_FILE_NAMES) && !defined(SAVE_DIR_PATH) morgue_dir = "morgue/"; #endif @@ -1870,22 +1870,24 @@ void game_options::read_option_line(const std::string &str, bool runscript) { remember_name = read_bool( field, remember_name ); } +#ifndef SAVE_DIR_PATH else if (key == "save_dir") { // If SAVE_DIR_PATH was defined, there are very likely security issues // with allowing the user to specify a different directory. -#ifndef SAVE_DIR_PATH save_dir = field; -#endif } +#endif else if (key == "show_turns") { show_turns = read_bool( field, show_turns ); } +#ifndef SAVE_DIR_PATH else if (key == "morgue_dir") { morgue_dir = field; } +#endif else if (key == "hp_warning") { hp_warning = atoi( field.c_str() ); @@ -2785,7 +2787,7 @@ bool parse_args( int argc, char **argv, bool rc_only ) if (!next_is_param) return (false); if (!rc_only) - Options.morgue_dir = next_arg; + SysEnv.morgue_dir = next_arg; nextUsed = true; break; |