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

Fix small error in previous commit and...

Browse source 
...restore WML warning about missing png extension
This commit is contained in:
Ali El Gariani 2010-06-27 17:30:48 +00:00
parent c2f75aba4e
commit 1b6fc9391b
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/builder.cpp
View file

@ -326,14 +326,17 @@ bool terrain_builder::rule_valid(const building_rule &rule) const
// but only for filenames not using ".."
bool precached = s.find("..") == std::string::npos;
s = "terrain/" + s;
if(precached) {
//TODO reactivate this (costly) warning
//if precached_file_exists(s+".png")
// lg::wml_error << "Terrain image '" << s << "' misses the '.png' extension\n";
return image::precached_file_exists(s);
} else {
return image::exists(s);
if(image::precached_file_exists(s))
continue;
} else if (image::exists(s)){
continue;
}
if(s.find(".png") == std::string::npos){
lg::wml_error << "Terrain image '" << s << "' misses the '.png' extension\n";
}
return false;
}
}
}