upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-26 22:10:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

make the lobby play music defined in a [lobby_music] wml tag...

Browse Source 
...and set it to default_playlist + main menu theme. Fixes bug #15668.
This commit is contained in:
Tomasz Śniatowski 2010-03-22 21:26:39 +01:00
parent 2da0389d81
commit 2069817fe7
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
data/multiplayer/_main.cfg
View File

@ -15,3 +15,12 @@
{multiplayer/scenarios/}
{multiplayer/eras.cfg}
[lobby_music]
{DEFAULT_MUSIC_PLAYLIST}
[music]
name=main_menu.ogg
ms_before=12000
append=yes
[/music]
[/lobby_music]

13
src/multiplayer.cpp
View File

@ -33,6 +33,7 @@
#include "playcampaign.hpp"
#include "upload_log.hpp"
#include "formula_string_utils.hpp"
#include "sound.hpp"
#include <boost/bind.hpp>
@ -521,9 +522,21 @@ static void do_preferences_dialog(game_display& disp, const config& game_config)
static void enter_lobby_mode(game_display& disp, const config& game_config, mp::chat& chat, config& gamelist)
{
mp::ui::result res;
while (true) {
const config &cfg = game_config.child("lobby_music");
if (cfg) {
foreach (const config &i, cfg.child_range("music")) {
sound::play_music_config(i);
}
sound::commit_music_changes();
} else {
sound::empty_playlist();
sound::stop_music();
}
lobby_info li(game_config);
gui2::tlobby_main dlg(game_config, li, disp);
dlg.set_preferences_callback(