From d0650b984a9d22727429bceb1d51a3dfb8aa84ef Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Tue, 8 Jul 2008 00:25:58 +0000 Subject: Save macro.txt and wininit.txt in the settings folder, both using the macro_dir option. We might want to rename said option. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6447 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/files.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'crawl-ref/source/files.cc') diff --git a/crawl-ref/source/files.cc b/crawl-ref/source/files.cc index c906a36123..f00a8cf58a 100644 --- a/crawl-ref/source/files.cc +++ b/crawl-ref/source/files.cc @@ -527,19 +527,19 @@ std::string datafile_path(std::string basename, #endif for (unsigned b = 0, size = bases.size(); b < size; ++b) - { for (unsigned p = 0; p < sizeof(prefixes) / sizeof(*prefixes); ++p) { std::string name = bases[b] + prefixes[p] + basename; if (file_exists(name)) return (name); } - } // Die horribly. if (croak_on_fail) + { end(1, false, "Cannot find data file '%s' anywhere, aborting\n", basename.c_str()); + } return (""); } -- cgit v1.2.3-54-g00ecf