diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-26 16:36:43 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-26 16:36:43 +0000 |
| commit | a20addc5d92d362f113a446e989c6a34cccd3c6c (patch) | |
| tree | ba0466427ba6acf82326db57ea37840cf2929b3b /crawl-ref/source/initfile.cc | |
| parent | a1daeea25c5d2187028661b6cd835ed3fee771e7 (diff) | |
| download | crawl-ref-a20addc5d92d362f113a446e989c6a34cccd3c6c.tar.gz crawl-ref-a20addc5d92d362f113a446e989c6a34cccd3c6c.zip | |
Moved all option files to settings directory.
Crawl loads init.txt from data file path if it can't find any other .crawlrc.
makefile changes to copy settings directory to install dir. Tested only on Linux/tty.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5258 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/initfile.cc')
| -rw-r--r-- | crawl-ref/source/initfile.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc index 02e74c0a30..7c848219b8 100644 --- a/crawl-ref/source/initfile.cc +++ b/crawl-ref/source/initfile.cc @@ -1133,7 +1133,9 @@ static std::string _find_crawlrc() } } - return (""); + // Last attempt: pick up init.txt from datafile_path, which will + // also search the settings/ directory. + return (datafile_path("init.txt", false, false)); } // Returns an error message if the init.txt was not found. |