[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.132,1.133

[Jochen Hoenicke]

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

Modified Files:
	resource.cpp 
Log Message:
Changed on_timer frequency in adlib so V3 SFX are correctly timed.
Changed V3 conversion code to adapt to the new (correct) speed.


Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -d -r1.132 -r1.133
--- resource.cpp	15 Aug 2003 07:45:21 -0000	1.132
+++ resource.cpp	15 Aug 2003 16:40:17 -0000	1.133
@@ -1198,7 +1198,6 @@
 		return 1;
 	}
 
-
 	/* This is a sfx resource.  First parse it quickly to find the parallel
 	 * tracks.
 	 */
@@ -1369,7 +1368,7 @@
 
 
 			/* FIXME:  delay factor found by try and error */
-			delay = (delay + 1) * 240 / 13;
+			delay = delay * 8;
 			
 			{
 				int freq = ((current_instr[ch][1] & 3) << 8)
@@ -1387,8 +1386,8 @@
 					note += freq2note[freq - 0x80];
 
 				debug(4, "Note: %d", note);
-				if (note < 0)
-				    note = 0;
+				if (note <= 0)
+				    note = 1;
 				else if (note > 127)
 				    note = 127;