diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-17 07:37:27 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-17 07:37:27 +0000 |
| commit | 1210d4439b7da2cea42e15892f7a09a03c6f0814 (patch) | |
| tree | 8d1b24e2c887803607fa028ba950fd5da5cbd7b4 /crawl-ref/source/initfile.cc | |
| parent | d05ad02e6ca609c768a843eb62beda9f602e821a (diff) | |
| download | crawl-ref-1210d4439b7da2cea42e15892f7a09a03c6f0814.tar.gz crawl-ref-1210d4439b7da2cea42e15892f7a09a03c6f0814.zip | |
Apply DOS fixes to trunk.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6580 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/initfile.cc')
| -rw-r--r-- | crawl-ref/source/initfile.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc index da0afef3d9..14f7e5536a 100644 --- a/crawl-ref/source/initfile.cc +++ b/crawl-ref/source/initfile.cc @@ -2911,6 +2911,9 @@ std::string game_options::resolve_include( // favoured file separator. parent_file = canonicalise_file_separator(parent_file); included_file = canonicalise_file_separator(included_file); +#if defined(DOS) + get_dos_compatible_file_name(&included_file); +#endif // How we resolve include paths: // 1. If it's an absolute path, use it directly. @@ -2951,9 +2954,8 @@ std::string game_options::resolve_include( return datafile_path(included_file, false, true); } -std::string game_options::resolve_include( - const std::string &file, - const char *type) +std::string game_options::resolve_include( const std::string &file, + const char *type) { try { @@ -2961,9 +2963,11 @@ std::string game_options::resolve_include( resolve_include(this->filename, file, &SysEnv.rcdirs); if (resolved.empty()) + { report_error( make_stringf("Cannot find %sfile \"%s\".", type, file.c_str())); + } return (resolved); } catch (const std::string &err) |