From a844f8e10213c19b6e48d6ff98e97bc9f026a42a Mon Sep 17 00:00:00 2001 From: dshaligram Date: Mon, 26 May 2008 15:30:07 +0000 Subject: 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 --- .gitignore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 1fba213d8b..e989de04fd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,8 @@ *.[oa] *.ann *.diff -saves/ -morgue/ +saves +morgue *.orig *.rej *.swp -- cgit v1.2.3-54-g00ecf