upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-11 09:54:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a potential problem with a recursive introduction section.

Browse Source 
Small fixes to unit display (currently not used)
This commit is contained in:
Kristoffer Erlandsson 2004-07-12 19:19:38 +00:00
parent 5101bd5491
commit dacd0dd15d
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/help.cfg
View File

@ -8,7 +8,7 @@ topics=about
[section] [section]
id=introduction id=introduction
title="Introduction" title="Introduction"
topics=introduction topics=introduction_topic
[/section] [/section]
[section] [section]
@ -42,7 +42,7 @@ generator=weapon_specials
[/section] [/section]
[topic] [topic]
id=introduction id=introduction_topic
title=Introduction title=Introduction
text="<img>src=misc/logo.png align=middle box=no</img> text="<img>src=misc/logo.png align=middle box=no</img>

15
src/help.cpp
View File

@ -54,7 +54,7 @@ namespace {
const std::string closed_section_img = "help/closed_section.png"; const std::string closed_section_img = "help/closed_section.png";
const std::string open_section_img = "help/open_section.png"; const std::string open_section_img = "help/open_section.png";
// The topic to open by default when opening the help dialog. // The topic to open by default when opening the help dialog.
const std::string default_show_topic = "introduction"; const std::string default_show_topic = "introduction_topic";
/// Return true if the id is valid for user defined topics and /// Return true if the id is valid for user defined topics and
/// sections. Some IDs are special, such as toplevel and may not be /// sections. Some IDs are special, such as toplevel and may not be
@ -484,12 +484,19 @@ std::vector<topic> generate_unit_topics() {
ss << cap(translate_string("advances_to")) << ": "; ss << cap(translate_string("advances_to")) << ": ";
for (std::vector<std::string>::const_iterator advance_it = next_units.begin(); for (std::vector<std::string>::const_iterator advance_it = next_units.begin();
advance_it != next_units.end(); advance_it++) { advance_it != next_units.end(); advance_it++) {
std::string ref_id = std::string("unit_") + *advance_it; std::string unit_id = *advance_it;
// Remove the spaces, which will create the ID to // Remove the spaces, which will create the ID to
// reference to. This relies a bit on that we know // reference to. This relies a bit on that we know
// that unit_type::id() does this. // that unit_type::id() does this.
ref_id.erase(std::remove(ref_id.begin(), ref_id.end(), ' '), ref_id.end()); unit_id.erase(std::remove(unit_id.begin(), unit_id.end(), ' '),
ss << "<ref>dst='" << ref_id << "' text='" << *advance_it << "'</ref>"; unit_id.end());
std::string ref_id = std::string("unit_") + unit_id;
std::string lang_unit = string_table[unit_id];
if (lang_unit == "") {
lang_unit = *advance_it;
}
ss << "<ref>dst='" << ref_id << "' text='" << lang_unit
<< "'</ref>";
if (advance_it + 1 != next_units.end()) { if (advance_it + 1 != next_units.end()) {
ss << ", "; ss << ", ";
} }