upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-13 11:35:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed hotkeys not working after joining a MP game, then returning in the lobby.

Browse Source
This commit is contained in:
Philippe Plantier 2005-02-26 22:41:19 +00:00
parent 920f5b467d
commit 3de66ed2b2
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/multiplayer.cpp
View File

@ -318,7 +318,6 @@ void start_server(display& disp, const config& game_config, game_data& data,
{
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 @@ void start_client(display& disp, const config& game_config, game_data& data,
const std::string host)
{
const network::manager net_manager;
const preferences::display_manager disp_manager(&disp);
mp::chat chat;
config gamelist;

2
src/multiplayer_ui.cpp
View File

@ -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 @@ ui::ui(display& disp, const config& cfg, chat& c, config& gamelist) :
gui::widget(disp),
hotkey_handler_(&disp),
disp_manager_(&disp),
game_config_(cfg),
chat_(c),

3
src/multiplayer_ui.hpp
View File

@ -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 @@ private:
// 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_;