diff options
| author | Paweł Kołodziejski | 2004-04-05 18:54:51 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2004-04-05 18:54:51 +0000 |
| commit | 924f47ccdd2ca163980d492e4fb62f0b8b1d6eb8 (patch) | |
| tree | a8085844beaf6e5b83c2904149ffe31487050144 /scumm | |
| parent | 74d902c62bc609d6d89f9e1ff0a4c32505fcf0d9 (diff) | |
| download | scummvm-rg350-924f47ccdd2ca163980d492e4fb62f0b8b1d6eb8.tar.gz scummvm-rg350-924f47ccdd2ca163980d492e4fb62f0b8b1d6eb8.tar.bz2 scummvm-rg350-924f47ccdd2ca163980d492e4fb62f0b8b1d6eb8.zip | |
there is no imuse in he engine
svn-id: r13470
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/script_v6he.cpp | 7 | ||||
| -rw-r--r-- | scumm/script_v7he.cpp | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/scumm/script_v6he.cpp b/scumm/script_v6he.cpp index a551a6b42c..9116436fb4 100644 --- a/scumm/script_v6he.cpp +++ b/scumm/script_v6he.cpp @@ -27,8 +27,6 @@ #include "scumm/actor.h" #include "scumm/charset.h" -#include "scumm/imuse.h" -#include "scumm/imuse_digi/dimuse.h" #include "scumm/intern.h" #include "scumm/object.h" #include "scumm/resource.h" @@ -1109,10 +1107,7 @@ void ScummEngine_v6he::o6_setVolume() { int volume = pop(); switch (subOp) { case 222: - if (_imuse) - _imuse->set_music_volume(volume); - else - _mixer->setMusicVolume(volume); + _mixer->setMusicVolume(volume); break; case 224: soundVolumeMaster = ConfMan.getInt("master_volume"); diff --git a/scumm/script_v7he.cpp b/scumm/script_v7he.cpp index 732d100152..8241ff36fb 100644 --- a/scumm/script_v7he.cpp +++ b/scumm/script_v7he.cpp @@ -27,8 +27,6 @@ #include "scumm/actor.h" #include "scumm/charset.h" -#include "scumm/imuse.h" -#include "scumm/imuse_digi/dimuse.h" #include "scumm/intern.h" #include "scumm/object.h" #include "scumm/resource.h" |