thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

there is no imuse in he engine

Browse source 
svn-id: r13470
This commit is contained in:
Paweł Kołodziejski 2004-04-05 18:54:51 +00:00
parent 74d902c62b
commit 924f47ccdd
2 changed files with 1 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
scumm/script_v6he.cpp
View file

@ -27,8 +27,6 @@
#include "scumm/actor.h" #include "scumm/actor.h"
#include "scumm/charset.h" #include "scumm/charset.h"
#include "scumm/imuse.h"
#include "scumm/imuse_digi/dimuse.h"
#include "scumm/intern.h" #include "scumm/intern.h"
#include "scumm/object.h" #include "scumm/object.h"
#include "scumm/resource.h" #include "scumm/resource.h"
@ -1109,10 +1107,7 @@ void ScummEngine_v6he::o6_setVolume() {
int volume = pop(); int volume = pop();
switch (subOp) { switch (subOp) {
case 222: case 222:
if (_imuse) _mixer->setMusicVolume(volume);
_imuse->set_music_volume(volume);
else
_mixer->setMusicVolume(volume);
break; break;
case 224: case 224:
soundVolumeMaster = ConfMan.getInt("master_volume"); soundVolumeMaster = ConfMan.getInt("master_volume");

2
scumm/script_v7he.cpp
View file

@ -27,8 +27,6 @@
#include "scumm/actor.h" #include "scumm/actor.h"
#include "scumm/charset.h" #include "scumm/charset.h"
#include "scumm/imuse.h"
#include "scumm/imuse_digi/dimuse.h"
#include "scumm/intern.h" #include "scumm/intern.h"
#include "scumm/object.h" #include "scumm/object.h"
#include "scumm/resource.h" #include "scumm/resource.h"