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

1 files changed, 6 insertions, 7 deletions

diff --git a/crawl-ref/init.txt b/crawl-ref/init.txt
index 1e31156b5c..1d54405d03 100644
--- a/crawl-ref/init.txt
+++ b/crawl-ref/init.txt
@@ -8,7 +8,7 @@
 # targeting interface. 
 # (New players should just ignore these lines.)
 #
-# : crawl.read_options('docs/034_monster_glyphs.txt')
+# include                   docs/034_monster_glyphs.txt
 # additional_macro_file   = docs/034_command_keys.txt
 # classic_item_colours    = true
 # classic_hud             = true
@@ -180,9 +180,11 @@ runrest_ignore_monster = butterfly:1
 
 trapwalk_safe_hp = dart:20,needle:15,arrow:35,bolt:45,spear:40,axe:45,blade:95
 
-# You can use the travel_stop_message for making autotravel better behaved.
-# The following file contains a list of such options, with explanations.
-: crawl.read_options('docs/travel_stoppers.txt')
+# You can use travel_stop_message to make autotravel stop for situations that
+# warrant your attention. This file (travel_stoppers.txt) contains a list of
+# travel_stop_message settings, with brief descriptions of what they do.
+
+include docs/travel_stoppers.txt
 
 ##### 4-h	Stashes ###############################
 #
@@ -351,9 +353,6 @@ tile_show_items = !?/%=([)X}+\_.
 # colour.lightgray = black
 # colour.lightcyan = cyan
 # colour.yellow    = brown
-#
-# Set the monster glyphs back to the way they were in 0.3.4
-# : crawl.read_options('docs/monster_glyphs.txt')
 
 # See options_guide.txt for the options
 # cset_ascii, cset_ibm, cset_dec, cset_unicode, cset_any,