[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth/src multiplayer.cpp multiplayer_ui.cpp ...
From: |
Philippe Plantier |
Subject: |
[Wesnoth-cvs-commits] wesnoth/src multiplayer.cpp multiplayer_ui.cpp ... |
Date: |
Sat, 26 Feb 2005 17:41:19 -0500 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Philippe Plantier <address@hidden> 05/02/26 22:41:19
Modified files:
src : multiplayer.cpp multiplayer_ui.cpp
multiplayer_ui.hpp
Log message:
Fixed hotkeys not working after joining a MP game, then returning in
the lobby.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer.cpp.diff?tr1=1.140&tr2=1.141&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_ui.cpp.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_ui.hpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
Patches:
Index: wesnoth/src/multiplayer.cpp
diff -u wesnoth/src/multiplayer.cpp:1.140 wesnoth/src/multiplayer.cpp:1.141
--- wesnoth/src/multiplayer.cpp:1.140 Sat Feb 26 22:16:34 2005
+++ wesnoth/src/multiplayer.cpp Sat Feb 26 22:41:19 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer.cpp,v 1.140 2005/02/26 22:16:34 Sirp Exp $ */
+/* $Id: multiplayer.cpp,v 1.141 2005/02/26 22:41:19 gruikya Exp $ */
/*
Copyright (C)
Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -318,7 +318,6 @@
{
mp::chat chat;
config gamelist;
- const preferences::display_manager disp_manager(&disp);
enter_create_mode(disp, game_config, data, chat, gamelist,
default_controller, is_server);
}
@@ -327,7 +326,6 @@
const std::string host)
{
const network::manager net_manager;
- const preferences::display_manager disp_manager(&disp);
mp::chat chat;
config gamelist;
Index: wesnoth/src/multiplayer_ui.cpp
diff -u wesnoth/src/multiplayer_ui.cpp:1.6 wesnoth/src/multiplayer_ui.cpp:1.7
--- wesnoth/src/multiplayer_ui.cpp:1.6 Sat Feb 26 22:16:34 2005
+++ wesnoth/src/multiplayer_ui.cpp Sat Feb 26 22:41:19 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_ui.cpp,v 1.6 2005/02/26 22:16:34 Sirp Exp $ */
+/* $Id: multiplayer_ui.cpp,v 1.7 2005/02/26 22:41:19 gruikya Exp $ */
/*
Copyright (C)
Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -14,7 +14,6 @@
#include "global.hpp"
#include "multiplayer_ui.hpp"
#include "network.hpp"
-#include "preferences.hpp"
#include "game_config.hpp"
#include "sound.hpp"
@@ -89,6 +88,7 @@
gui::widget(disp),
hotkey_handler_(&disp),
+ disp_manager_(&disp),
game_config_(cfg),
chat_(c),
Index: wesnoth/src/multiplayer_ui.hpp
diff -u wesnoth/src/multiplayer_ui.hpp:1.2 wesnoth/src/multiplayer_ui.hpp:1.3
--- wesnoth/src/multiplayer_ui.hpp:1.2 Thu Feb 24 20:00:00 2005
+++ wesnoth/src/multiplayer_ui.hpp Sat Feb 26 22:41:19 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_ui.hpp,v 1.2 2005/02/24 20:00:00 gruikya Exp $ */
+/* $Id: multiplayer_ui.hpp,v 1.3 2005/02/26 22:41:19 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 "preferences.hpp"
#include "hotkeys.hpp"
#include <deque>
@@ -137,6 +138,8 @@
// Ensures standard hotkeys are coorectly handled
const hotkey::basic_handler hotkey_handler_;
+ const preferences::display_manager disp_manager_;
+
// The main game configuration, as defined by loading the preprocessed
// WML files. Access using the game_config() method if necessary.
const config& game_config_;