[Scummvm-cvs-logs] CVS: scummvm/scumm player_v3a.cpp,1.19,1.20 player_v3a.h,1.18,1.19

[Travis Howell]

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

Modified Files:
	player_v3a.cpp player_v3a.h 
Log Message:

Another Amiga V3 sounds update from Quietust:
Music is closer to the way it sounds on a real Amiga
Fixes the drums in the Indy3 'Berlin' music


Index: player_v3a.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_v3a.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- player_v3a.cpp	8 Jan 2004 20:37:25 -0000	1.19
+++ player_v3a.cpp	15 Feb 2004 08:06:32 -0000	1.20
@@ -311,6 +311,8 @@
 		if (oct > 5)
 			oct = 5;
 		int rate = 3579545 / note_freqs[_wavetable[inst]->_oct[oct]][pit];
+		if (!_wavetable[inst]->_llen[oct])
+			dur = _wavetable[inst]->_ilen[oct] * 60 / rate;
 		char *data = (char *)malloc(_wavetable[inst]->_ilen[oct] + _wavetable[inst]->_llen[oct]);
 		if (_wavetable[inst]->_idat[oct])
 			memcpy(data, _wavetable[inst]->_idat[oct], _wavetable[inst]->_ilen[oct]);

Index: player_v3a.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_v3a.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- player_v3a.h	8 Jan 2004 20:37:25 -0000	1.18
+++ player_v3a.h	15 Feb 2004 08:06:32 -0000	1.19
@@ -51,7 +51,7 @@
 
 private:
 	enum {
-		V3A_MAXMUS = 16,
+		V3A_MAXMUS = 24,
 		V3A_MAXSFX = 16
 	};