FR 1977121: alias for option values (I called them "variables"). You

can have an option file line "$FOO := BAR", and then whenever you have
a line "option = $FOO" it will get turned into "option = BAR".  Doesn't
undo variable settings from include files, so that we can theoretically
have a settings/standard_colours.txt to define the default colours used
in settings/food_colouring and settings/menu_colours, and then the
user can override them.


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

1 files changed, 2 insertions, 0 deletions

diff --git a/crawl-ref/source/externs.h b/crawl-ref/source/externs.h
index 3277e74189..102e7f7fc3 100644
--- a/crawl-ref/source/externs.h
+++ b/crawl-ref/source/externs.h
@@ -1890,6 +1890,7 @@ public:
 private:
     typedef std::map<std::string, std::string> string_map;
     string_map               aliases;
+    string_map               variables;
     std::set<std::string>    included; // Files we've included already.
 
 public:
@@ -1905,6 +1906,7 @@ public:
 
 private:
     std::string unalias(const std::string &key) const;
+    std::string expand_vars(const std::string &field) const;
     void add_alias(const std::string &alias, const std::string &name);
 
     void clear_feature_overrides();