0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added new @ prefix to {inclusion} in config files

Browse source 
to make it search both in the user's preferences dir and in the main data dir
This commit is contained in:
Dave White 2004-09-03 23:48:43 +00:00
parent 1e5aa1c0b6
commit 69160b3eb2
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/config.cpp
View file

@ -310,13 +310,19 @@ void internal_preprocess_data(const std::string& data,
std::string nfname;
//if the filename begins with a '~', then look
//in the user's data directory
if(newfilename != "" && newfilename[0] == '~') {
//in the user's data directory. If the filename begins with
//a '@' then we look in the user's data directory,
//but default to the standard data directory if it's not found
//there.
if(newfilename != "" && (newfilename[0] == '~' || newfilename[0] == '@')) {
nfname = newfilename;
prefix = get_user_data_dir() + "/";
nfname.erase(nfname.begin(),nfname.begin()+1);
nfname = prefix + "data/" + nfname;
if(newfilename[0] == '@' && file_exists(nfname) == false && is_directory(nfname) == false) {
nfname = "data/" + newfilename.substr(1);
}
} else if(newfilename.size() >= 2 && newfilename[0] == '.' &&
newfilename[1] == '/' ) {
//if the filename begins with a "./", then look