[Wesnoth-cvs-commits] wesnoth/src multiplayer.cpp multiplayer_ui.cpp ...

[Philippe Plantier]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Philippe Plantier <address@hidden>      05/02/24 20:00:00

Modified files:
        src            : multiplayer.cpp multiplayer_ui.cpp 
                         multiplayer_ui.hpp 

Log message:
        Fixed bug #12123: hotkeys being applied twice when a MP game is started.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer.cpp.diff?tr1=1.137&tr2=1.138&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_ui.cpp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_ui.hpp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: wesnoth/src/multiplayer.cpp
diff -u wesnoth/src/multiplayer.cpp:1.137 wesnoth/src/multiplayer.cpp:1.138
--- wesnoth/src/multiplayer.cpp:1.137   Wed Feb 23 22:54:52 2005
+++ wesnoth/src/multiplayer.cpp Thu Feb 24 20:00:00 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer.cpp,v 1.137 2005/02/23 22:54:52 gruikya Exp $ */
+/* $Id: multiplayer.cpp,v 1.138 2005/02/24 20:00:00 gruikya Exp $ */
 /*
    Copyright (C)
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -22,7 +22,6 @@
 #include "log.hpp"
 #include "playlevel.hpp"
 #include "network.hpp"
-#include "hotkeys.hpp"
 
 #define LOG_NW lg::info(lg::network)
 
@@ -31,7 +30,7 @@
 class network_game_manager
 {
 public:
-       // Add this to avoid stupid warnings with somme versions of GCC
+       // Add a constructor to avoid stupid warnings with some versions of GCC
        network_game_manager() {};
 
        ~network_game_manager()
@@ -319,7 +318,6 @@
        mp::chat chat;
        config gamelist;
        const preferences::display_manager disp_manager(&disp);
-       const hotkey::basic_handler key_handler(&disp);
 
        enter_create_mode(disp, game_config, data, chat, gamelist, 
default_controller, is_server);
 }
@@ -329,7 +327,6 @@
 {
        const network::manager net_manager;
        const preferences::display_manager disp_manager(&disp);
-       const hotkey::basic_handler key_handler(&disp);
 
        mp::chat chat;
        config gamelist;
Index: wesnoth/src/multiplayer_ui.cpp
diff -u wesnoth/src/multiplayer_ui.cpp:1.1 wesnoth/src/multiplayer_ui.cpp:1.2
--- wesnoth/src/multiplayer_ui.cpp:1.1  Sun Feb 20 22:46:38 2005
+++ wesnoth/src/multiplayer_ui.cpp      Thu Feb 24 20:00:00 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_ui.cpp,v 1.1 2005/02/20 22:46:38 gruikya Exp $ */
+/* $Id: multiplayer_ui.cpp,v 1.2 2005/02/24 20:00:00 gruikya Exp $ */
 /*
    Copyright (C) 
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -86,6 +86,8 @@
 ui::ui(display& disp, const config& cfg, chat& c, config& gamelist) :
        gui::widget(disp),
 
+       hotkey_handler_(&disp),
+
        game_config_(cfg),
        chat_(c),
        gamelist_(gamelist),
Index: wesnoth/src/multiplayer_ui.hpp
diff -u wesnoth/src/multiplayer_ui.hpp:1.1 wesnoth/src/multiplayer_ui.hpp:1.2
--- wesnoth/src/multiplayer_ui.hpp:1.1  Sun Feb 20 22:46:38 2005
+++ wesnoth/src/multiplayer_ui.hpp      Thu Feb 24 20:00:00 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_ui.hpp,v 1.1 2005/02/20 22:46:38 gruikya Exp $ */
+/* $Id: multiplayer_ui.hpp,v 1.2 2005/02/24 20:00:00 gruikya Exp $ */
 /*
    Copyright (C) 
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -19,6 +19,7 @@
 #include "widgets/menu.hpp"
 #include "network.hpp"
 #include "config.hpp"
+#include "hotkeys.hpp"
 
 #include <deque>
 #include <string>
@@ -133,6 +134,9 @@
        // Returns the current gamelist
        config& gamelist() { return gamelist_; };
 private:
+       // Ensures standard hotkeys are coorectly handled
+       const hotkey::basic_handler hotkey_handler_;
+
        // The main game configuration, as defined by loading the preprocessed
        // WML files. Access using the game_config() method if necessary.
        const config& game_config_;