Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'shandley/title-music-single-play' into 'master'

Browse Source 
Title music fix

Closes #342

See merge request veloren/veloren!600
This commit is contained in:
Joshua Barretto 2019-10-17 07:58:58 +00:00
commit b090a1b5cd
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
voxygen/src/menu/main/mod.rs
View File

@ -16,6 +16,7 @@ use ui::{Event as MainMenuEvent, MainMenuUi};
pub struct MainMenuState {
main_menu_ui: MainMenuUi,
title_music_channel: Option<usize>,
}
impl MainMenuState {
@ -23,6 +24,7 @@ impl MainMenuState {
pub fn new(global_state: &mut GlobalState) -> Self {
Self {
main_menu_ui: MainMenuUi::new(global_state),
title_music_channel: None,
}
}
}
@ -38,9 +40,13 @@ impl PlayState for MainMenuState {
let mut client_init: Option<ClientInit> = None;
// Kick off title music
global_state
.audio
.play_music("voxygen.audio.soundtrack.veloren_title_tune-3");
if None == self.title_music_channel {
self.title_music_channel = Some(
global_state
.audio
.play_music("voxygen.audio.soundtrack.veloren_title_tune-3"),
)
}
loop {
// Handle window events.