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

Fix sidebar always showing text for [damage_type]alternative_type=

Browse source 
When any of the images is missing, a text description is shown as a fallback.
The bug being fixed is that the search for the secondary PNGs used the basename
with neither the directory nor the ".png".

The existence of the files controls a single conditional block, but was using
three bools with two dedicated to single files and one shared between all the
alternate files. This changes it to a single bool shared between all files for
clarity.
This commit is contained in:
newfrenchy83 2024-06-05 20:06:22 +02:00 • committed by Steve Cotton
parent 43f5644e36
commit 2c13a67fa6
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/reports.cpp
View file

@ -883,15 +883,17 @@ static int attack_info(const reports::context& rc, const attack_type &at, config
const std::string range_png = std::string("icons/profiles/") + at.range() + "_attack.png~SCALE_INTO(16,16)";
const std::string type_png = std::string("icons/profiles/") + type + ".png~SCALE_INTO(16,16)";
std::vector<std::string> secondary_types_png;
bool secondary_type_png_exist = true;
for(auto alt_t : alt_types){
for(const auto& alt_t : alt_types) {
secondary_types_png.push_back(std::string("icons/profiles/") + alt_t + ".png~SCALE_INTO(16,16)");
if(!image::locator(alt_t).file_exists() && secondary_type_png_exist) {secondary_type_png_exist=false;}
}
const bool range_png_exists = image::locator(range_png).file_exists();
const bool type_png_exists = image::locator(type_png).file_exists();
if(!range_png_exists || !type_png_exists || (!secondary_type_png_exist && !alt_types.empty())) {
// If any of the images is missing, then add a text description too.
bool all_pngs_exist = image::locator(range_png).file_exists();
all_pngs_exist &= image::locator(type_png).file_exists();
for(const auto& png : secondary_types_png) {
all_pngs_exist &= image::locator(png).file_exists();
}
if(!all_pngs_exist) {
str << span_color(font::weapon_details_color) << " " << " "
<< range << font::weapon_details_sep
<< lang_type << "</span>\n";