[Scummvm-cvs-logs] CVS: scummvm/scumm sound_he.cpp,2.7,2.8

kirben kirben at users.sourceforge.net
Thu Jan 5 17:26:05 CET 2006


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

Modified Files:
	sound_he.cpp 
Log Message:
No longer required.


Index: sound_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound_he.cpp,v
retrieving revision 2.7
retrieving revision 2.8
diff -u -d -r2.7 -r2.8
--- sound_he.cpp	5 Jan 2006 11:38:45 -0000	2.7
+++ sound_he.cpp	6 Jan 2006 01:25:31 -0000	2.8
@@ -301,7 +301,6 @@
 
 void Sound::playHESound(int soundID, int heOffset, int heChannel, int heFlags) {
 	debug(0,"playHESound: soundID %d heOffset %d heChannel %d heFlags %d", soundID, heOffset, heChannel, heFlags);
-	byte *mallocedPtr = NULL;
 	byte *ptr, *spoolPtr;
 	char *sound;
 	int size = -1;
@@ -358,9 +357,6 @@
 			_vm->_mixer->playRaw(&_heSoundChannels[heChannel], spoolPtr, size, 11025, flags, soundID);
 			return;
 		}
-
-		// This pointer will be freed at the end of the function
-		mallocedPtr = spoolPtr;
 	}
 
 	if (soundID > _vm->_numSounds) {
@@ -474,8 +470,6 @@
 			_vm->_musicEngine->startSound(soundID);
 		}
 	}
-
-	free(mallocedPtr);
 }
 
 void Sound::startHETalkSound(uint32 offset) {





More information about the Scummvm-git-logs mailing list