[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6he.cpp,2.42,2.43 script_v7he.cpp,2.9,2.10

[Pawel Kolodziejski]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22838

Modified Files:
	script_v6he.cpp script_v7he.cpp 
Log Message:
there is no imuse in he engine

Index: script_v6he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6he.cpp,v
retrieving revision 2.42
retrieving revision 2.43
diff -u -d -r2.42 -r2.43
--- script_v6he.cpp	3 Apr 2004 19:41:30 -0000	2.42
+++ script_v6he.cpp	5 Apr 2004 18:54:50 -0000	2.43
@@ -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 @@
 	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");

Index: script_v7he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v7he.cpp,v
retrieving revision 2.9
retrieving revision 2.10
diff -u -d -r2.9 -r2.10
--- script_v7he.cpp	2 Mar 2004 10:22:55 -0000	2.9
+++ script_v7he.cpp	5 Apr 2004 18:54:51 -0000	2.10
@@ -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"