diff options
author | Jonathan Gray | 2003-08-02 02:31:36 +0000 |
---|---|---|
committer | Jonathan Gray | 2003-08-02 02:31:36 +0000 |
commit | a932a74dcb8185bc0ddb8edbe98d6c64eb1a8f97 (patch) | |
tree | 125f4ee55fe1f9f129a94096b5f244b9df6499bf /sword2/sword2.cpp | |
parent | 02d061598c1a808264ba732fbda8631644cce88f (diff) | |
download | scummvm-rg350-a932a74dcb8185bc0ddb8edbe98d6c64eb1a8f97.tar.gz scummvm-rg350-a932a74dcb8185bc0ddb8edbe98d6c64eb1a8f97.tar.bz2 scummvm-rg350-a932a74dcb8185bc0ddb8edbe98d6c64eb1a8f97.zip |
patch #781530 Initial work on StreamCompMusic() by erik
svn-id: r9394
Diffstat (limited to 'sword2/sword2.cpp')
-rw-r--r-- | sword2/sword2.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sword2/sword2.cpp b/sword2/sword2.cpp index e7dcf62bff..bbc522f37a 100644 --- a/sword2/sword2.cpp +++ b/sword2/sword2.cpp @@ -106,6 +106,14 @@ Sword2State::Sword2State(GameDetector *detector, OSystem *syst) g_sword2 = this; _features = detector->_game.features; _gameId = detector->_game.id; + + // Setup mixer + if (!_mixer->bindToSystem(syst)) + warning("Sound initialization failed"); + + _mixer->setVolume(kDefaultSFXVolume * kDefaultMasterVolume / 255); + + _sound = new Sword2Sound(_mixer); } @@ -167,8 +175,6 @@ int32 Sword2State::InitialiseGame(void) Init_event_system(); Zdebug("RETURNED."); - _sound = new Sword2Sound; - Zdebug("CALLING: Init_fx_queue"); Init_fx_queue(); // initialise the sound fx queue Zdebug("RETURNED."); |