Author: esr
Date: Wed Apr 9 17:02:43 2008
New Revision: 25704
URL: http://svn.gna.org/viewcvs/wesnoth?rev=25704&view=rev
Log:
More name changes to avoid type vs. name confusion.
Modified:
trunk/src/dialogs.cpp
trunk/src/dialogs.hpp
trunk/src/help.cpp
Modified: trunk/src/dialogs.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/dialogs.cpp?rev=25704&r1=25703&r2=25704&view=diff
==============================================================================
--- trunk/src/dialogs.cpp (original)
+++ trunk/src/dialogs.cpp Wed Apr 9 17:02:43 2008
@@ -925,7 +925,7 @@
det.image = u.still_image();
det.name = u.name();
- det.lang_name = u.type_name();
+ det.type_name = u.type_name();
det.level = u.level();
det.alignment = unit_type::alignment_description(u.alignment());
det.traits = u.traits_description();
@@ -984,7 +984,7 @@
det.image = image::get_image(t->image()+mod);
det.name = "";
- det.lang_name = t->type_name();
+ det.type_name = t->type_name();
det.level = t->level();
det.alignment = unit_type::alignment_description(t->alignment());
Modified: trunk/src/dialogs.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/dialogs.hpp?rev=25704&r1=25703&r2=25704&view=diff
==============================================================================
--- trunk/src/dialogs.hpp (original)
+++ trunk/src/dialogs.hpp Wed Apr 9 17:02:43 2008
@@ -71,7 +71,7 @@
enum TYPE { SHOW_ALL, SHOW_BASIC };
struct details {
surface image;
- std::string name, lang_name;
+ std::string name, type_name;
int level;
std::string alignment, traits;
std::vector<std::string> abilities;
Modified: trunk/src/help.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/help.cpp?rev=25704&r1=25703&r2=25704&view=diff
==============================================================================
--- trunk/src/help.cpp (original)
+++ trunk/src/help.cpp Wed Apr 9 17:02:43 2008
@@ -1087,11 +1087,11 @@
if (!type.hide_help()) {
//add a link in the
list of units having this special
- std::string lang_name =
type.type_name();
+ std::string type_name =
type.type_name();
std::string ref_id =
unit_prefix + type.id();
//we put the translated
name at the beginning of the hyperlink,
//so the automatic
alphabetic sorting of std::set can use it
- std::string link =
"<ref>text='" + escape(lang_name) + "' dst='" + escape(ref_id) + "'</ref>";
+ std::string link =
"<ref>text='" + escape(type_name) + "' dst='" + escape(ref_id) + "'</ref>";
special_units[special].insert(link);
}
}
@@ -1154,11 +1154,11 @@
if (!type.hide_help()) {
//add a link in the list of units
having this ability
- std::string lang_name =
type.type_name();
+ std::string type_name =
type.type_name();
std::string ref_id = unit_prefix +
type.id();
//we put the translated name at the
beginning of the hyperlink,
//so the automatic alphabetic sorting
of std::set can use it
- std::string link = "<ref>text='" +
escape(lang_name) + "' dst='" + escape(ref_id) + "'</ref>";
+ std::string link = "<ref>text='" +
escape(type_name) + "' dst='" + escape(ref_id) + "'</ref>";
ability_units[*it].insert(link);
}
}
@@ -1573,16 +1573,16 @@
if (desc_type != FULL_DESCRIPTION)
continue;
- const std::string lang_name = type.type_name();
+ const std::string type_name = type.type_name();
const std::string ref_id = hidden_symbol(type.hide_help()) +
unit_prefix + type.id();
- topic unit_topic(lang_name, ref_id, "");
+ topic unit_topic(type_name, ref_id, "");
//unit_topic.text = new unit_topic_generator(type);
topics.push_back(unit_topic);
if (!type.hide_help()) {
// we also record an hyperlink of this unit
// in the list used for the race topic
- std::string link = "<ref>text='" + escape(lang_name) +
"' dst='" + escape(ref_id) + "'</ref>";
+ std::string link = "<ref>text='" + escape(type_name) +
"' dst='" + escape(ref_id) + "'</ref>";
race_units.insert(link);
}
}
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
