remove decprecated unit/ image loading code

This commit is contained in:
Pauli Nieminen 2008-08-25 15:38:39 +00:00
parent 708c847124
commit b4a94859bd

View File

@ -299,24 +299,12 @@ surface locator::load_image_file() const
std::string location = get_binary_file_location("images", val_.filename_);
bool try_units = false;
do {
{
if (!location.empty()) {
res = IMG_Load(location.c_str());
}
if (res.null() && (!try_units)) {
try_units = true;
location = get_binary_file_location("images", "units/" + val_.filename_);
if (!location.empty() && !val_.filename_.empty()) {
LOG_STREAM(err, filesystem) << "warning: implict prefix 'units/' for '" <<
val_.filename_ << "'. Support of this will be removed in 1.5.3\n";
}
} else {
try_units = false;
}
} while (try_units);
}
if (res.null() && !val_.filename_.empty()) {
ERR_DP << "could not open image '" << val_.filename_ << "'\n";