aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorPaweł Kołodziejski2002-08-24 15:58:08 +0000
committerPaweł Kołodziejski2002-08-24 15:58:08 +0000
commit66630ec3b30c731ae7ea2e5dae01dc89ffc3a03b (patch)
treeeab7a878863def6dc1f373f7e5b7e6d6237b2467 /scumm
parent9f993a1d29120120b3d9c08d56ca1990f4222ae5 (diff)
downloadscummvm-rg350-66630ec3b30c731ae7ea2e5dae01dc89ffc3a03b.tar.gz
scummvm-rg350-66630ec3b30c731ae7ea2e5dae01dc89ffc3a03b.tar.bz2
scummvm-rg350-66630ec3b30c731ae7ea2e5dae01dc89ffc3a03b.zip
missing changes
svn-id: r4823
Diffstat (limited to 'scumm')
-rw-r--r--scumm/scummvm.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index 68057f075c..85f49d2270 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -114,7 +114,7 @@ Scumm::Scumm (GameDetector *detector, OSystem *syst)
/* Bind the mixer to the system => mixer will be invoked
* automatically when samples need to be generated */
- if (!_mixer->bind_to_system(syst)) {
+ if (!_mixer->bindToSystem(syst)) {
warning("Sound initialization failed");
if (detector->_use_adlib) {
_use_adlib = false;
@@ -123,8 +123,8 @@ Scumm::Scumm (GameDetector *detector, OSystem *syst)
warning("Adlib music was selected, switching to midi null driver");
}
}
- _mixer->set_volume(kDefaultSFXVolume);
- _mixer->set_music_volume(kDefaultMusicVolume);
+ _mixer->setVolume(kDefaultSFXVolume);
+ _mixer->setMusicVolume(kDefaultMusicVolume);
// Init iMuse