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

Addon/Info: removed now-unnecessary icon fallbacks

Browse source 
GUI2 no longer needs this. An empty icon is simply not drawn, and the addon list widget forces
72x72 size for all icons so it's not even needed to size the image column. The image-not-found
image is also handled elsewhere (the general image loading code) and isn't needed here.
This commit is contained in:
Charles Dang 2017-10-13 12:28:43 +11:00
parent d024900cd0
commit 41a3bf97f9
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/addon/info.cpp
View file

@ -28,8 +28,6 @@ static lg::log_domain log_addons_client("addons-client");
#define LOG_AC LOG_STREAM(info, log_addons_client)
namespace {
const std::string fallback_addon_icon = "misc/blank-hex.png";
void resolve_deps_recursive(const addons_list& addons, const std::string& base_id, std::set<std::string>& dest)
{
addons_list::const_iterator it = addons.find(base_id);
@ -137,13 +135,9 @@ std::string addon_info::display_icon() const
if(ret.empty()) {
ERR_AC << "add-on '" << id << "' doesn't have an icon path set" << std::endl;
ret = fallback_addon_icon;
}
else if(!image::exists(ret)) {
} else if(!image::exists(ret)) {
ERR_AC << "add-on '" << id << "' has an icon which cannot be found: '" << ret << "'" << std::endl;
ret = game_config::debug ? game_config::images::missing : fallback_addon_icon;
}
else if(ret.find("units/") != std::string::npos && ret.find_first_of('~') == std::string::npos) {
} else if(ret.find("units/") != std::string::npos && ret.find_first_of('~') == std::string::npos) {
// HACK: prevent magenta icons, because they look awful
LOG_AC << "add-on '" << id << "' uses a unit baseframe as icon without TC/RC specifications\n";
ret += "~RC(magenta>red)";