[Scummvm-cvs-logs] CVS: scummvm/sound adpcm.cpp,1.13,1.14

[Max Horn]

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

Modified Files:
	adpcm.cpp 
Log Message:
Unified IMA code a little bit

Index: adpcm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/adpcm.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- adpcm.cpp	9 Dec 2005 21:42:19 -0000	1.13
+++ adpcm.cpp	9 Dec 2005 22:04:28 -0000	1.14
@@ -166,8 +166,8 @@
 	_status.stepIndex += stepAdjust(code);
 	if (_status.stepIndex < 0)
 		_status.stepIndex = 0;
-	if (_status.stepIndex > 48)
-		_status.stepIndex = 48;
+	if (_status.stepIndex > ARRAYSIZE(okiStepSize) - 1)
+		_status.stepIndex = ARRAYSIZE(okiStepSize) - 1;
 
 	// * 16 effectively converts 12-bit input to 16-bit output
 	return samp * 16;
@@ -213,8 +213,8 @@
 	_status.stepIndex += stepAdjust(code);
 	if (_status.stepIndex < 0)
 		_status.stepIndex = 0;
-	if (_status.stepIndex > 88)
-		_status.stepIndex = 88;
+	if (_status.stepIndex > ARRAYSIZE(imaStepTable) - 1)
+		_status.stepIndex = ARRAYSIZE(imaStepTable) - 1;
 
 	return samp;
 }