[Wesnoth-cvs-commits] wesnoth/src builder.cpp multiplayer_client.cpp ...

[Guillaume Melquiond]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Guillaume Melquiond <address@hidden>    04/09/19 07:24:59

Modified files:
        src            : builder.cpp multiplayer_client.cpp 
        src/widgets    : slider.cpp 

Log message:
        Fix constructor initialization lists and variable initializations

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/builder.cpp.diff?tr1=1.34&tr2=1.35&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_client.cpp.diff?tr1=1.65&tr2=1.66&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/slider.cpp.diff?tr1=1.29&tr2=1.30&r1=text&r2=text

Patches:
Index: wesnoth/src/builder.cpp
diff -u wesnoth/src/builder.cpp:1.34 wesnoth/src/builder.cpp:1.35
--- wesnoth/src/builder.cpp:1.34        Sat Sep 11 21:22:57 2004
+++ wesnoth/src/builder.cpp     Sun Sep 19 07:24:59 2004
@@ -1,4 +1,4 @@
-/* $Id: builder.cpp,v 1.34 2004/09/11 21:22:57 gruikya Exp $ */
+/* $Id: builder.cpp,v 1.35 2004/09/19 07:24:59 silene Exp $ */
 /*
    Copyright (C) 2004 by Philippe Plantier <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -51,13 +51,13 @@
 const int terrain_builder::rule_image::UNITPOS = 36 + 18;
 
 terrain_builder::rule_image::rule_image(int layer, bool global_image) : 
-       layer(layer), global_image(global_image),
-       position(HORIZONTAL), basex(0), basey(0) 
+       position(HORIZONTAL), layer(layer),
+       basex(0), basey(0), global_image(global_image)
 {};
 
 terrain_builder::rule_image::rule_image(int x, int y, bool global_image) : 
-       layer(0), global_image(global_image),
-       position(VERTICAL), basex(x), basey(y) 
+       position(VERTICAL), layer(0),
+       basex(x), basey(y), global_image(global_image)
 {};
 
 terrain_builder::tile::tile() : last_tod("invalid_tod")
@@ -496,7 +496,7 @@
                } else if((**img)["position"] == "vertical") {
 
                        std::vector<std::string> base = 
config::split((**img)["base"]);
-                       int basex, basey;
+                       int basex = 0, basey = 0;
 
                        if(base.size() >= 2) {
                                basex = atoi(base[0].c_str());
Index: wesnoth/src/multiplayer_client.cpp
diff -u wesnoth/src/multiplayer_client.cpp:1.65 
wesnoth/src/multiplayer_client.cpp:1.66
--- wesnoth/src/multiplayer_client.cpp:1.65     Sat Sep 18 21:55:19 2004
+++ wesnoth/src/multiplayer_client.cpp  Sun Sep 19 07:24:59 2004
@@ -66,9 +66,9 @@
 public:
        wait_for_start(display& disp, config& cfg, const game_data& data, int 
team_num,
                        const std::string& team_name, const std::string& 
team_leader)
-               : got_side(false), team(team_num), name(team_name), 
leader(team_leader),
-                 status(START_GAME), disp_(disp),
-                 sides_(cfg), cancel_button_(NULL), menu_(NULL), 
units_data_(data)
+               : status(START_GAME), got_side(false), team(team_num),
+                 name(team_name), leader(team_leader), disp_(disp), 
sides_(cfg),
+                 units_data_(data), cancel_button_(NULL), menu_(NULL)
        {
                SDL_Rect empty_rect = {0,0,0,0};
                area_ = empty_rect;
@@ -580,7 +580,7 @@
 
 leader_list_manager::leader_list_manager(const config::child_list& side_list,
                const game_data* data, gui::combo* combo) :
-       combo_(combo), side_list_(side_list), data_(data)
+       side_list_(side_list), data_(data), combo_(combo)
 {
 #if 0
        for(config::const_child_iterator itor = side_list.begin(); itor != 
side_list.end(); ++itor) {
@@ -695,10 +695,10 @@
 leader_preview_pane::leader_preview_pane(display& disp, const game_data* data,
                const config::child_list& side_list) :
        gui::preview_pane(disp),
-       side_list_(side_list), selection_(0),
+       side_list_(side_list),
        leader_combo_(disp, std::vector<std::string>()), 
        leaders_(side_list, data, &leader_combo_),
-       data_(data)
+       selection_(0), data_(data)
 {
 
        set_location(leader_pane_position);
Index: wesnoth/src/widgets/slider.cpp
diff -u wesnoth/src/widgets/slider.cpp:1.29 wesnoth/src/widgets/slider.cpp:1.30
--- wesnoth/src/widgets/slider.cpp:1.29 Sat Sep 18 22:51:17 2004
+++ wesnoth/src/widgets/slider.cpp      Sun Sep 19 07:24:59 2004
@@ -1,4 +1,4 @@
-/* $Id: slider.cpp,v 1.29 2004/09/18 22:51:17 gruikya Exp $ */
+/* $Id: slider.cpp,v 1.30 2004/09/19 07:24:59 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -27,8 +27,8 @@
 namespace gui {
 
 slider::slider(display& d, const SDL_Rect& rect)
-       : widget(d, rect), min_(-100000), max_(100000), increment_(1), 
-         value_(0), highlight_(false), clicked_(true), dragging_(false)
+       : widget(d, rect), min_(-100000), max_(100000), value_(0), 
+         increment_(1), highlight_(false), clicked_(true), dragging_(false)
 {
        set_dirty(true);
 }