0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Switch to the new MP lobby.

Browse source 
The lobby still needs more testing and polishing, enabled now to get
some feedback before the next release.
This commit is contained in:
Mark de Wever 2009-10-26 21:22:35 +00:00
parent 3a4f091758
commit 4c7c8d84de
4 changed files with 22 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
RELEASE_NOTES
View file

@ -13,7 +13,8 @@ The release team should empty this file after each release.
***
REPLACE ME WITH CONTENT...
Switched the MP lobby to the new lobby made by ilor during his GSoC 2009
project.
***

1
changelog
View file

@ -15,6 +15,7 @@ Version 1.7.7+svn:
* Improve display order of unit healing (patch #1343)
* Fix the new-widgets addon list dialog
* Add fallback scrollbars if a window doesn't fit (bug #13180)
* Switch to the new MP lobby
Version 1.7.7:
* AI:

1
players_changelog
View file

@ -14,6 +14,7 @@ Version 1.7.7+svn:
* User interface:
* Fixed storyscreen buttons occasionally disappearing.
* Improve display order of unit healing (patch #1343)
* Switch to the new MP lobby
Version 1.7.7:

42
src/multiplayer.cpp
View file

@ -506,30 +506,24 @@ static void enter_lobby_mode(game_display& disp, const config& game_config, mp::
lobby_info li(game_config);
while (true) {
if(gui2::new_widgets) {
gui2::tlobby_main dlg(game_config, li, disp);
dlg.set_preferences_callback(
boost::bind(do_preferences_dialog,
boost::ref(disp), boost::ref(game_config)));
dlg.show(disp.video());
//ugly kludge for launching other dialogs like the old lobby
switch (dlg.get_legacy_result()) {
case gui2::tlobby_main::CREATE:
res = mp::ui::CREATE;
break;
case gui2::tlobby_main::JOIN:
res = mp::ui::JOIN;
break;
case gui2::tlobby_main::OBSERVE:
res = mp::ui::OBSERVE;
break;
default:
res = mp::ui::QUIT;
}
} else {
mp::lobby ui(disp, game_config, chat, gamelist);
run_lobby_loop(disp, ui);
res = ui.get_result();
gui2::tlobby_main dlg(game_config, li, disp);
dlg.set_preferences_callback(
boost::bind(do_preferences_dialog,
boost::ref(disp), boost::ref(game_config)));
dlg.show(disp.video());
//ugly kludge for launching other dialogs like the old lobby
switch (dlg.get_legacy_result()) {
case gui2::tlobby_main::CREATE:
res = mp::ui::CREATE;
break;
case gui2::tlobby_main::JOIN:
res = mp::ui::JOIN;
break;
case gui2::tlobby_main::OBSERVE:
res = mp::ui::OBSERVE;
break;
default:
res = mp::ui::QUIT;
}
switch (res) {