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

[Guillaume Melquiond]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Guillaume Melquiond <address@hidden>    04/10/19 05:23:38

Modified files:
        src            : help.cpp 

Log message:
        Fix displaying of translated terrains in help.

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

Patches:
Index: wesnoth/src/help.cpp
diff -u wesnoth/src/help.cpp:1.34 wesnoth/src/help.cpp:1.35
--- wesnoth/src/help.cpp:1.34   Fri Oct 15 08:39:33 2004
+++ wesnoth/src/help.cpp        Tue Oct 19 05:23:38 2004
@@ -858,7 +858,7 @@
        for (std::vector<gamemap::TERRAIN>::const_iterator terrain_it = 
show_info_about.begin();
                 terrain_it != show_info_about.end(); terrain_it++) {
                const terrain_type& info = map->get_terrain_info(*terrain_it);
-               const std::string &name = info.name();
+               const std::string &name = string_table[info.name()];
                std::stringstream ss;
                ss << "<img>src='terrain/" << info.default_image() << 
".png'</img>\n\n";
                if (info.is_alias()) {
@@ -867,7 +867,7 @@
                        for (std::string::const_iterator it = 
aliased_terrains.begin();
                                 it != aliased_terrains.end(); it++) {
                                const gamemap::TERRAIN t = *it;
-                               const std::string alias_name = 
map->get_terrain_info(t).name();
+                               const std::string &alias_name = 
string_table[map->get_terrain_info(t).name()];
                                alias_ss << "<ref>text='" << escape(alias_name) 
<< "' dst='"
                                                 << 
escape(std::string("terrain_") + t) << "'</ref>";
                                if (it + 2 == aliased_terrains.end()) {