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

Fix female units not appearing in the help;

Browse source 
the converter was not compatible with the new parser: missing
quotes. Also clean a bit error messages.
This commit is contained in:
Guillaume Melquiond 2005-04-26 19:57:44 +00:00
parent 94f6f16547
commit b456000ad7
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/help.cpp
View file

@ -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 @@ void help_text_area::add_img_item(const std::string path, const std::string alig
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 @@ std::string convert_to_wml(const std::string &element_name, const std::string &c
}
else {
if (c == '\'' && !last_char_escape) {
ss << '"';
in_quotes = !in_quotes;
}
else if ((c == ' ' || c == '\n') && !last_char_escape && !in_quotes) {