[Wesnoth-cvs-commits] wesnoth/src hotkeys.cpp multiplayer_connect.cpp

[Guillaume Melquiond]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Guillaume Melquiond <[EMAIL PROTECTED]> 04/11/06 20:00:50

Modified files:
        src            : hotkeys.cpp multiplayer_connect.cpp 

Log message:
        Fix initialization order and remove unused variable.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/hotkeys.cpp.diff?tr1=1.62&tr2=1.63&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_connect.cpp.diff?tr1=1.85&tr2=1.86&r1=text&r2=text

Patches:
Index: wesnoth/src/hotkeys.cpp
diff -u wesnoth/src/hotkeys.cpp:1.62 wesnoth/src/hotkeys.cpp:1.63
--- wesnoth/src/hotkeys.cpp:1.62        Sun Oct 31 20:42:16 2004
+++ wesnoth/src/hotkeys.cpp     Sat Nov  6 20:00:50 2004
@@ -1,4 +1,4 @@
-/* $Id: hotkeys.cpp,v 1.62 2004/10/31 20:42:16 gruikya Exp $ */
+/* $Id: hotkeys.cpp,v 1.63 2004/11/06 20:00:50 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <[EMAIL PROTECTED]>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -112,7 +112,7 @@
 
 hotkey_item::hotkey_item(HOTKEY_COMMAND id, const std::string& command, const 
std::string& description, bool hidden) 
        : id_(id), command_(command), description_(description), keycode_(0),
-       alt_(false), ctrl_(false), shift_(false), cmd_(false), hidden_(hidden)
+         shift_(false), ctrl_(false), alt_(false), cmd_(false), hidden_(hidden)
 {
 }
 
Index: wesnoth/src/multiplayer_connect.cpp
diff -u wesnoth/src/multiplayer_connect.cpp:1.85 
wesnoth/src/multiplayer_connect.cpp:1.86
--- wesnoth/src/multiplayer_connect.cpp:1.85    Mon Nov  1 18:06:36 2004
+++ wesnoth/src/multiplayer_connect.cpp Sat Nov  6 20:00:50 2004
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_connect.cpp,v 1.85 2004/11/01 18:06:36 gruikya Exp $ */
+/* $Id: multiplayer_connect.cpp,v 1.86 2004/11/06 20:00:50 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <[EMAIL PROTECTED]>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -519,7 +519,6 @@
        }
 
        const config::child_itors sides = level_->child_range("side");
-       SDL_Rect rect;
 
        for(size_t n = 0; n != combos_type_.size(); ++n) {
                config& side = **(sides.first+n);