Author: mordante
Date: Tue Aug 12 20:55:21 2008
New Revision: 28502
URL: http://svn.gna.org/viewcvs/wesnoth?rev=28502&view=rev
Log:
Initialize all members.
Modified:
trunk/src/menu_events.cpp
Modified: trunk/src/menu_events.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/menu_events.cpp?rev=28502&r1=28501&r2=28502&view=diff
==============================================================================
--- trunk/src/menu_events.cpp (original)
+++ trunk/src/menu_events.cpp Tue Aug 12 20:55:21 2008
@@ -132,12 +132,23 @@
}
menu_handler::menu_handler(game_display* gui, unit_map& units,
std::vector<team>& teams,
- const config& level, const gamemap& map,
- const config& game_config, const gamestatus& status,
game_state& gamestate,
- undo_list& undo_stack, undo_list& redo_stack) :
- gui_(gui), units_(units), teams_(teams), level_(level), map_(map),
- game_config_(game_config), status_(status),
gamestate_(gamestate), undo_stack_(undo_stack),
- redo_stack_(redo_stack)
+ const config& level, const gamemap& map,
+ const config& game_config, const gamestatus& status,
game_state& gamestate,
+ undo_list& undo_stack, undo_list& redo_stack) :
+ gui_(gui),
+ units_(units),
+ teams_(teams),
+ level_(level),
+ map_(map),
+ game_config_(game_config),
+ status_(status),
+ gamestate_(gamestate),
+ undo_stack_(undo_stack),
+ redo_stack_(redo_stack),
+ textbox_info_(),
+ last_search_(),
+ last_search_hit_(),
+ last_recruit_()
{
}
@@ -327,10 +338,14 @@
namespace {
class leader_scroll_dialog : public gui::dialog {
public:
- leader_scroll_dialog(display &disp, const std::string &title,
std::vector<bool> &leader_bools, int selected, gui::DIALOG_RESULT extra_result)
- : dialog(disp, title, "", gui::NULL_DIALOG),
leader_bools_(leader_bools), extra_result_(extra_result)
- {
- scroll_btn_ = new gui::standard_dialog_button(disp.video(),
_("Scroll To"), 0, false);
+ leader_scroll_dialog(display &disp, const std::string &title,
+ std::vector<bool> &leader_bools, int selected,
+ gui::DIALOG_RESULT extra_result) :
+ dialog(disp, title, "", gui::NULL_DIALOG),
+ scroll_btn_(new gui::standard_dialog_button(disp.video(),
_("Scroll To"), 0, false)),
+ leader_bools_(leader_bools),
+ extra_result_(extra_result)
+ {
scroll_btn_->enable(leader_bools[selected]);
add_button(scroll_btn_, gui::dialog::BUTTON_STANDARD);
add_button(new gui::standard_dialog_button(disp.video(),
@@ -1679,16 +1694,20 @@
class cmd_arg_parser
{
public:
- cmd_arg_parser()
- : str_(""), args_end(false)
- {
- args.push_back(0);
- }
- explicit cmd_arg_parser(const std::string& str)
- : str_(str), args_end(false)
- {
- args.push_back(0);
- }
+ cmd_arg_parser() :
+ str_(""),
+ args(1, 0),
+ args_end(false)
+ {
+ }
+
+ explicit cmd_arg_parser(const std::string& str) :
+ str_(str),
+ args(1, 0),
+ args_end(false)
+ {
+ }
+
void parse(const std::string& str)
{
str_ = str;
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
