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

Restore a check to prevent portrait-less units from using a scaled sprite instead

Browse source
This commit is contained in:
Charles Dang 2015-08-09 14:41:05 +11:00
parent cd0b12387b
commit cd50036363
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/help/help_topic_generators.cpp
View file

@ -260,11 +260,11 @@ std::string unit_topic_generator::operator()() const {
const std::string &female_portrait = female_type.small_profile();
// TODO: figure out why the second checks don't match but the last does
if (!male_portrait.empty() /*&& male_portrait != male_type.image()*/ && male_portrait != "unit_image") {
if (!male_portrait.empty() && male_portrait != male_type.image() && male_portrait != "unit_image") {
ss << "<img>src='" << male_portrait << "~SCALE(205,205)~BG()' align='right'</img> ";
}
if (!female_portrait.empty() && female_portrait != male_portrait /*&& female_portrait != female_type.image()*/ && female_portrait != "unit_image") {
if (!female_portrait.empty() && female_portrait != male_portrait && female_portrait != female_type.image() && female_portrait != "unit_image") {
ss << "<img>src='" << female_portrait << "~SCALE(205,205)~BG()' align='right'</img> ";
}