From 292816a9de3eb80cee7c0feb8f02cc6069a7a718 Mon Sep 17 00:00:00 2001 From: dshaligram Date: Wed, 28 May 2008 19:19:43 +0000 Subject: Fix broken handling of option aliases in included files (dpeg). git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5315 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/initfile.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'crawl-ref/source/initfile.cc') 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 optfile(this->filename, include_file); + + // Also unwind any aliases defined in included files. + unwind_var 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); } } -- cgit v1.2.3-54-g00ecf