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

Cleanups and a compiler fix based on patch #911.

Browse source
This commit is contained in:
Mark de Wever 2008-02-25 18:58:29 +00:00
parent c7b73d7d77
commit c903e63a98
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog
View file

@ -9,6 +9,7 @@ Version 1.3.19+svn:
* miscellaneous and bug fixes:
* units with a death sound but no death animation now play their death
sound correctly
* cleanups and a compiler fix based on patch #911
Version 1.3.19:
* map editor:

6
src/help.cpp
View file

@ -2939,7 +2939,7 @@ std::string get_first_word(const std::string &s)
//! Open the help browser, show topic with id show_topic.
//!
//! If show_topic is the empty string, the default topic will be shown.
void show_help(display &disp, std::string show_topic, int xloc, int yloc)
void show_help(display &disp, const std::string& show_topic, int xloc, int yloc)
{
show_help(disp, toplevel, show_topic, xloc, yloc);
}
@ -2947,7 +2947,7 @@ void show_help(display &disp, std::string show_topic, int xloc, int yloc)
//! Open the help browser, show unit with id unit_id.
//!
//! If show_topic is the empty string, the default topic will be shown.
void show_unit_help(display &disp, std::string show_topic, bool hidden, int xloc, int yloc)
void show_unit_help(display &disp, const std::string& show_topic, bool hidden, int xloc, int yloc)
{
show_help(disp, toplevel, hidden_symbol(hidden) + unit_prefix + show_topic, xloc, yloc);
}
@ -2957,7 +2957,7 @@ void show_unit_help(display &disp, std::string show_topic, bool hidden, int xloc
//! This allows for complete customization of the contents,
//! although not in a very easy way.
void show_help(display &disp, const section &toplevel_sec,
const std::string show_topic,
const std::string& show_topic,
int xloc, int yloc)
{
const events::event_context dialog_events_context;

6
src/help.hpp
View file

@ -36,16 +36,16 @@ struct section;
/// Open a help dialog using a toplevel other than the default. This
/// allows for complete customization of the contents, although not in a
/// very easy way.
void show_help(display &disp, const section &toplevel, const std::string show_topic="",
void show_help(display &disp, const section &toplevel, const std::string& show_topic="",
int xloc=-1, int yloc=-1);
/// Open the help browser. The help browser will have the topic with id
/// show_topic open if it is not the empty string. The default topic
/// will be shown if show_topic is the empty string.
void show_help(display &disp, const std::string show_topic="", int xloc=-1, int yloc=-1);
void show_help(display &disp, const std::string& show_topic="", int xloc=-1, int yloc=-1);
/// wrapper to add unit prefix and hidding symbol
void show_unit_help(display &disp, const std::string unit_id, bool hidden = false,
void show_unit_help(display &disp, const std::string& unit_id, bool hidden = false,
int xloc=-1, int yloc=-1);
class help_button : public gui::dialog_button, public hotkey::command_executor {