[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.232,1.233

Max Horn fingolfin at users.sourceforge.net
Sat Sep 6 16:36:02 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv17862

Modified Files:
	sound.cpp 
Log Message:
small tweak requested by unused on IRC

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -d -r1.232 -r1.233
--- sound.cpp	6 Sep 2003 10:47:30 -0000	1.232
+++ sound.cpp	6 Sep 2003 23:35:42 -0000	1.233
@@ -436,8 +436,8 @@
 			size = READ_BE_UINT16(ptr + 12);
 			rate = 3579545 / READ_BE_UINT16(ptr + 20);
 			sound = (char *)malloc(size);
-			int vol = ptr[24] << 1;
-			memcpy(sound,ptr + READ_BE_UINT16(ptr + 8),size);
+			int vol = ptr[24] * 4;
+			memcpy(sound,ptr + READ_BE_UINT16(ptr + 8), size);
 			if ((_scumm->_features & GF_AMIGA) && (READ_BE_UINT16(ptr + 16) || READ_BE_UINT16(ptr + 6))) {
 				// the first check is for pitch-bending looped sounds (i.e. "pouring liquid", "biplane dive", etc.)
 				// the second check is for simple looped sounds
@@ -466,7 +466,7 @@
 					rate = 3579545 / READ_BE_UINT16(ptr + 2);
 
 				if ((READ_BE_UINT16(ptr) == 0x357c) && (READ_BE_UINT16(ptr + 4) == 8))
-					vol = READ_BE_UINT16(ptr + 2) * 2;
+					vol = READ_BE_UINT16(ptr + 2) * 4;
 				ptr += 2;
 				i += 2;
 			}





More information about the Scummvm-git-logs mailing list