upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-30 20:25:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove deprecated {@include/file.cfg} functionality,

Browse Source 
...leave in an stderr message explaining this.
This commit is contained in:
Alexander van Gessel 2009-08-28 23:01:58 +01:00
parent 8388a4c0ea
commit 42c931190f
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/filesystem.cpp
View File

@ -1056,20 +1056,17 @@ std::string get_wml_location(const std::string &filename, const std::string &cur
if (filename[0] == '@')
{
ERR_FS << filename << " style includes are deprecated and will be removed in 1.7.3. Use '~' instead.\n";
// TODO: remove this before 1.8
ERR_FS << filename << " style includes are obsolete and no longer work. Use '~' instead.\n";
}
if (filename[0] == '~' || filename[0] == '@')
if (filename[0] == '~')
{
// If the filename starts with '~' or '@', look in the user data directory.
// If the filename starts with '~', look in the user data directory.
result = get_user_data_dir() + "/data/" + filename.substr(1);
DBG_FS << " trying '" << result << "'\n";
already_found = file_exists(result) || is_directory(result);
// If it starts with '@', look also in the standard data directory.
if (filename[0] == '@' && !already_found && !game_config::path.empty())
result = game_config::path + "/data/" + filename.substr(1);
}
else if (filename.size() >= 2 && filename[0] == '.' && filename[1] == '/')
{