mirror of
https://github.com/wesnoth/wesnoth
synced 2025-05-13 16:43:49 +00:00
remove decprecated unit/ image loading code
This commit is contained in:
parent
708c847124
commit
b4a94859bd
@ -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";
|
||||
|
Loading…
x
Reference in New Issue
Block a user