[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.423,1.424

Torbjörn Andersson eriktorbjorn at users.sourceforge.net
Tue Feb 15 02:36:40 CET 2005


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

Modified Files:
	sound.cpp 
Log Message:
Re-phrased comment to make it sound more like the fact it is and less like
a "FIXME".


Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.423
retrieving revision 1.424
diff -u -d -r1.423 -r1.424
--- sound.cpp	15 Feb 2005 08:15:35 -0000	1.423
+++ sound.cpp	15 Feb 2005 10:32:55 -0000	1.424
@@ -235,7 +235,7 @@
 			return;
 		}
 
-		// This pointer needs to be freed
+		// This pointer will be freed at the end of the function
 		mallocedPtr = ptr;
 	} else {
 		debugC(DEBUG_SOUND, "playSound #%d (room %d)", soundID, 
@@ -509,7 +509,7 @@
 		rate = 3579545 / READ_BE_UINT16(ptr + 20);
 		sound = (char *)malloc(size);
 		int vol = ptr[24] * 4;
-		memcpy(sound,ptr + READ_BE_UINT16(ptr + 8), size);
+		memcpy(sound, ptr + READ_BE_UINT16(ptr + 8), size);
 		_vm->_mixer->playRaw(NULL, sound, size, rate, SoundMixer::FLAG_AUTOFREE, soundID, vol, 0);
 	}
 	else {





More information about the Scummvm-git-logs mailing list