From 9ab694b6f678fdad3b2b28cf3850bcff79eff2fc Mon Sep 17 00:00:00 2001 From: "M. Sz" Date: Tue, 10 Nov 2020 12:05:35 +0100 Subject: [PATCH] Music in cinematics menu --- d2app/app.go | 2 +- d2game/d2gamescreen/cinematics.go | 26 ++++++++++++++++---------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/d2app/app.go b/d2app/app.go index ff03c99a..b1713bd2 100644 --- a/d2app/app.go +++ b/d2app/app.go @@ -964,5 +964,5 @@ func (a *App) ToCredits() { // ToCinematics forces the game to transition to the cinematics menu func (a *App) ToCinematics() { - a.screen.SetNextScreen(d2gamescreen.CreateCinematics(a, a.asset, a.renderer, a.ui)) + a.screen.SetNextScreen(d2gamescreen.CreateCinematics(a, a.asset, a.renderer, a.audio, a.ui)) } diff --git a/d2game/d2gamescreen/cinematics.go b/d2game/d2gamescreen/cinematics.go index c9bd9859..78a9d7d4 100644 --- a/d2game/d2gamescreen/cinematics.go +++ b/d2game/d2gamescreen/cinematics.go @@ -39,12 +39,13 @@ type Cinematics struct { cinematicsExitBtn *d2ui.Button cinematicsLabel *d2ui.Label - asset *d2asset.AssetManager - renderer d2interface.Renderer - navigator d2interface.Navigator - uiManager *d2ui.UIManager - videoDecoder *d2video.BinkDecoder - inputManager d2interface.InputManager + asset *d2asset.AssetManager + renderer d2interface.Renderer + navigator d2interface.Navigator + uiManager *d2ui.UIManager + videoDecoder *d2video.BinkDecoder + inputManager d2interface.InputManager + audioProvider d2interface.AudioProvider } // CreateCinematics creates an instance of the credits screen @@ -52,12 +53,14 @@ func CreateCinematics( navigator d2interface.Navigator, asset *d2asset.AssetManager, renderer d2interface.Renderer, + aup d2interface.AudioProvider, ui *d2ui.UIManager) *Cinematics { result := &Cinematics{ - asset: asset, - renderer: renderer, - navigator: navigator, - uiManager: ui, + asset: asset, + renderer: renderer, + navigator: navigator, + uiManager: ui, + audioProvider: aup, } return result @@ -67,6 +70,9 @@ func CreateCinematics( func (v *Cinematics) OnLoad(loading d2screen.LoadingState) { var err error + // v.audioProvider.SetVolumes(1, 1) + v.audioProvider.PlayBGM("") + v.cinematicsBackground, err = v.uiManager.NewSprite(d2resource.CinematicsBackground, d2resource.PaletteSky) if err != nil {