[Wesnoth-cvs-commits] wesnoth/src help.cpp

[David White]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     David White <[EMAIL PROTECTED]> 05/05/29 20:56:12

Modified files:
        src            : help.cpp 

Log message:
        fixed bug where unit help pages with no portrait would show the unit 
image in place of the portrait

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/help.cpp.diff?tr1=1.101&tr2=1.102&r1=text&r2=text

Patches:
Index: wesnoth/src/help.cpp
diff -u wesnoth/src/help.cpp:1.101 wesnoth/src/help.cpp:1.102
--- wesnoth/src/help.cpp:1.101  Sun May 22 15:54:18 2005
+++ wesnoth/src/help.cpp        Sun May 29 20:56:12 2005
@@ -1035,11 +1035,11 @@
                const std::string& male_portrait = male_type.image_profile();
                const std::string& female_portrait = 
female_type.image_profile();
 
-               if (male_portrait.empty() == false) {
+               if (male_portrait.empty() == false && male_portrait != 
male_type.image()) {
                        ss << "<img>src='" << male_portrait << "' 
align='right'</img> ";
                }
 
-               if (female_portrait.empty() == false && female_portrait != 
male_portrait) {
+               if (female_portrait.empty() == false && female_portrait != 
male_portrait && female_portrait != female_type.image()) {
                        ss << "<img>src='" << female_portrait << "' 
align='right'</img> ";
                }