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.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index 92b230a6dc..ff2dcef9b8 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -2886,11 +2886,15 @@ void game_options::include(const std::string &rawfilename,
// Change this->filename to the included filename while we're reading it.
unwind_var<std::string> optfile(this->filename, include_file);
+
+ // Also unwind any aliases defined in included files.
+ unwind_var<string_map> unwalias(aliases);
+
FILE* f = fopen( include_file.c_str(), "r" );
if (f)
{
FileLineInput fl(f);
- read_options(fl, runscript);
+ this->read_options(fl, runscript, false);
fclose(f);
}
}