[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.421,1.422
kirben
kirben at users.sourceforge.net
Mon Feb 14 02:03:33 CET 2005
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30497/scumm
Modified Files:
sound.cpp
Log Message:
Correct sound TAG for Backyard sports games
Fix memory leak.
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.421
retrieving revision 1.422
diff -u -d -r1.421 -r1.422
--- sound.cpp 14 Feb 2005 03:12:41 -0000 1.421
+++ sound.cpp 14 Feb 2005 10:02:34 -0000 1.422
@@ -546,6 +546,10 @@
_vm->_musicEngine->startSound(soundID);
}
}
+
+
+ if (soundID > _vm->_numSounds)
+ delete ptr;
}
void Sound::processSfxQueues() {
@@ -1307,7 +1311,7 @@
total_size = _fileHandle.readUint32BE();
_fileHandle.read(createResource(type, idx, total_size), total_size - 8);
return 1;
- } else if (basetag == MKID('WSOU')) {
+ } else if (basetag == MKID('RIFF')) {
_fileHandle.seek(-12, SEEK_CUR);
total_size = _fileHandle.readUint32BE();
_fileHandle.read(createResource(type, idx, total_size), total_size - 8);
More information about the Scummvm-git-logs
mailing list