summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/initfile.cc
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/initfile.cc')
-rw-r--r--crawl-ref/source/initfile.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index 22fb404cfc..805d9d4312 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -598,6 +598,7 @@ void game_options::reset_options()
#if !defined(SHORT_FILE_NAMES) && !defined(SAVE_DIR_PATH)
morgue_dir = "morgue/";
#endif
+ additional_macro_files.clear();
player_name.clear();
@@ -1614,7 +1615,7 @@ void game_options::read_option_line(const std::string &str, bool runscript)
trim_string( field );
// Keep unlowercased field around
- std::string orig_field = field;
+ const std::string orig_field = field;
if (key != "name" && key != "crawl_dir"
&& key != "race" && key != "class" && key != "ban_pickup"
@@ -2696,7 +2697,10 @@ void game_options::read_option_line(const std::string &str, bool runscript)
else
pickup_mode = read_bool_or_number(field, pickup_mode, "auto:");
}
-
+ else if (key == "additional_macro_file")
+ {
+ additional_macro_files.push_back(orig_field);
+ }
#ifdef USE_TILE
else if (key == "show_items")
{