diff options
author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-26 15:30:07 +0000 |
---|---|---|
committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-26 15:30:07 +0000 |
commit | a844f8e10213c19b6e48d6ff98e97bc9f026a42a (patch) | |
tree | 9cada2344ca78a2c2de555dc8b7fa943ee7382fe /crawl-ref/source/initfile.h | |
parent | 1f1939b11a6ed95f769644c21e53589a1e7abeb9 (diff) | |
download | crawl-ref-a844f8e10213c19b6e48d6ff98e97bc9f026a42a.tar.gz crawl-ref-a844f8e10213c19b6e48d6ff98e97bc9f026a42a.zip |
Better support for settings files that include other files:
- Files can be included as "include foo" in .crawlrc instead of using
the Lua call: : crawl.read_options('foo'). include foo and the Lua
crawl.read_options('foo') are not equivalent - Lua only runs after the
start of a new game, which is too late for some option settings.
- Crawl searches for included files in this sequence:
- Absolute paths: use the path directly (but not if DATA_DIR_PATH is
set, since we don't want Crawl to read arbitrary files on
multiuser systems).
- Search relative to the including file.
- Search relative to any -rcdir(s) provided.
- Search in the data file search path.
- The data file search path now includes settings/ for when we move rc
stuff to settings/
.gitignore: ignore saves and morgue dirs correctly.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5256 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/initfile.h')
-rw-r--r-- | crawl-ref/source/initfile.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/crawl-ref/source/initfile.h b/crawl-ref/source/initfile.h index c700be59ef..b04b3f3850 100644 --- a/crawl-ref/source/initfile.h +++ b/crawl-ref/source/initfile.h @@ -53,10 +53,14 @@ void get_system_environment(void); struct system_environment { +public: std::string crawl_name; std::string crawl_pizza; std::string crawl_rc; std::string crawl_dir; + + std::vector<std::string> rcdirs; // Directories to search for includes. + std::string morgue_dir; std::string crawl_base; // Directory from argv[0], may be used to // locate datafiles. @@ -73,6 +77,9 @@ struct system_environment std::vector<std::string> cmd_args; int map_gen_iters; + +public: + void add_rcdir(const std::string &dir); }; extern system_environment SysEnv; |