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, 4 insertions, 0 deletions

diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc
index c44b0f88a6..4f1dce7695 100644
--- a/crawl-ref/source/itemname.cc
+++ b/crawl-ref/source/itemname.cc
@@ -1696,6 +1696,9 @@ bool item_type_known(const object_class_type base_type, const int sub_type)
         return false;
 }
 
+// [ds] Will the owner of this unused function step up and end its
+// suffering? :P
+#if 0
 static bool _randart_has_known_property(const item_def &item)
 {
     for (int rap = 0; rap < RAP_NUM_PROPERTIES; rap++)
@@ -1704,6 +1707,7 @@ static bool _randart_has_known_property(const item_def &item)
 
     return false;
 }
+#endif
 
 bool item_type_tried( const item_def& item )
 {