[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.60,1.61
Pawel Kolodziejski
aquadran at users.sourceforge.net
Sat Dec 28 07:43:03 CET 2002
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv11695
Modified Files:
sound.cpp
Log Message:
fix playVoice
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- sound.cpp 28 Dec 2002 15:02:23 -0000 1.60
+++ sound.cpp 28 Dec 2002 15:42:44 -0000 1.61
@@ -1135,13 +1135,13 @@
strcpy(name, sound);
strcat(name, ".IMX");
ptr = (byte *)malloc(1000000);
- if (_scumm->_bundle->decompressVoiceSampleByName(name, ptr, channels)) {
+ if (_scumm->_bundle->decompressVoiceSampleByName(name, ptr, channels) == 0) {
delete ptr;
return -1;
}
} else {
ptr = (byte *)malloc(1000000);
- if (_scumm->_bundle->decompressVoiceSampleByName(sound, ptr, channels)) {
+ if (_scumm->_bundle->decompressVoiceSampleByName(sound, ptr, channels) == 0) {
delete ptr;
return -1;
}
@@ -1163,7 +1163,6 @@
bits = READ_BE_UINT32(ptr); ptr += 4;
rate = READ_BE_UINT32(ptr); ptr += 4;
channels = READ_BE_UINT32(ptr); ptr += 4;
- ptr += 16;
break;
case MKID_BE('TEXT'):
case MKID_BE('REGN'):
More information about the Scummvm-git-logs
mailing list