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

[Guillaume Melquiond]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Guillaume Melquiond <address@hidden>    05/04/26 19:57:45

Modified files:
        src            : help.cpp 

Log message:
        Fix female units not appearing in the help; the converter was not 
compatible with the new parser: missing quotes. Also clean a bit error messages.

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

Patches:
Index: wesnoth/src/help.cpp
diff -u wesnoth/src/help.cpp:1.94 wesnoth/src/help.cpp:1.95
--- wesnoth/src/help.cpp:1.94   Mon Apr 25 14:50:52 2005
+++ wesnoth/src/help.cpp        Tue Apr 26 19:57:44 2005
@@ -22,6 +22,7 @@
 #include "help.hpp"
 #include "image.hpp"
 #include "language.hpp"
+#include "log.hpp"
 #include "preferences.hpp"
 #include "sdl_utils.hpp"
 #include "show_dialog.hpp"
@@ -1979,15 +1980,11 @@
                                                                  const bool 
floating, const bool box)
 {
        surface surf(image::get_image(path, image::UNSCALED));
-       if (surf == NULL) {
-               std::stringstream msg;
-               msg << "Image " << path << " could not be loaded.";
-               std::cerr << msg.str();
+       if (surf.null())
                return;
-       }
        ALIGNMENT align = str_to_align(alignment);
        if (align == HERE && floating) {
-               std::cerr << "Floating image with align HERE, aligning left." 
<< std::endl;
+               LOG_STREAM(warn, display) << "Floating image with align HERE, 
aligning left.\n";
                align = LEFT;
        }
        const int width = surf->w + (box ? box_width * 2 : 0);
@@ -2488,6 +2485,7 @@
                }
                else {
                        if (c == '\'' && !last_char_escape) {
+                               ss << '"';
                                in_quotes = !in_quotes;
                        }
                        else if ((c == ' ' || c == '\n') && !last_char_escape 
&& !in_quotes) {