Restore a check to prevent portrait-less units from using a scaled sp…

…rite instead
wesnoth · Aug 9, 2015 · cd50036 · cd50036
1 parent cd0b123
commit cd50036
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/help/help_topic_generators.cpp b/src/help/help_topic_generators.cpp
@@ -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> ";
 		}