[Scummvm-cvs-logs] CVS: scummvm/scumm script_v7he.cpp,2.17,2.18 sound.cpp,1.336,1.337

Travis Howell kirben at users.sourceforge.net
Tue Jun 22 19:22:11 CEST 2004


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

Modified Files:
	script_v7he.cpp sound.cpp 
Log Message:

Enable some sound support in HE7 games.


Index: script_v7he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v7he.cpp,v
retrieving revision 2.17
retrieving revision 2.18
diff -u -d -r2.17 -r2.18
--- script_v7he.cpp	23 Jun 2004 01:36:57 -0000	2.17
+++ script_v7he.cpp	23 Jun 2004 02:21:10 -0000	2.18
@@ -665,7 +665,8 @@
 		break;
 
 	case 232:
-		pop();
+		//FIXME Ignoring extra arguments for now.
+		_sound->addSoundToQueue(pop());
 		// _staticVar4 = pop();
 		// _staticVar3 = 0;
 		// _staticVar1 = 11025;

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.336
retrieving revision 1.337
diff -u -d -r1.336 -r1.337
--- sound.cpp	22 Jun 2004 10:39:46 -0000	1.336
+++ sound.cpp	23 Jun 2004 02:21:10 -0000	1.337
@@ -941,7 +941,10 @@
 	}
 
 	if (!file->isOpen()) {
-		sprintf(buf, "%s.tlk", _vm->getGameName());
+		if (_vm->_heversion >= 70)
+			sprintf(buf, "%s.he2", _vm->getGameName());
+		else
+			sprintf(buf, "%s.tlk", _vm->getGameName());
 		if (file->open(buf))
 			file->setEnc(0x69);
 		_soundMode = kVOCMode;





More information about the Scummvm-git-logs mailing list