[1852851] Fixed option aliases not being used inside Lua conditional blocks in .crawlrc.

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

1 files changed, 6 insertions, 4 deletions

diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index ea53949930..e6cd2746e1 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -1139,10 +1139,10 @@ void read_options(FILE *f, bool runscript)
     Options.read_options(fl, runscript);
 }
 
-void read_options(const std::string &s, bool runscript)
+void read_options(const std::string &s, bool runscript, bool clear_aliases)
 {
     StringLineInput st(s);
-    Options.read_options(st, runscript);
+    Options.read_options(st, runscript, clear_aliases);
 }
 
 game_options::game_options()
@@ -1150,7 +1150,8 @@ game_options::game_options()
     reset_options();
 }
 
-void game_options::read_options(InitLineInput &il, bool runscript)
+void game_options::read_options(InitLineInput &il, bool runscript,
+                                bool clear_aliases)
 {
     unsigned int line = 0;
     
@@ -1160,7 +1161,8 @@ void game_options::read_options(InitLineInput &il, bool runscript)
 
     bool l_init        = false;
 
-    aliases.clear();
+    if (clear_aliases)
+        aliases.clear();
     
     std::string luacond;
     std::string luacode;