[Scummvm-cvs-logs] CVS: scummvm/sound adpcm.cpp,1.2,1.3 mixer.cpp,1.190,1.191

Max Horn fingolfin at users.sourceforge.net
Sun May 8 14:51:22 CEST 2005


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

Modified Files:
	adpcm.cpp mixer.cpp 
Log Message:
Comply to our coding conventions

Index: adpcm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/adpcm.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- adpcm.cpp	3 May 2005 22:12:23 -0000	1.2
+++ adpcm.cpp	8 May 2005 21:49:50 -0000	1.3
@@ -148,16 +148,16 @@
 	samp = _status.last + diff;
 
     // Clip the values to +/- 2^11 (supposed to be 12 bits)
-	if(samp > 2048)
+	if (samp > 2048)
 		samp = 2048;
-	if(samp < -2048)
+	if (samp < -2048)
 		samp = -2048;
 
 	_status.last = samp;
 	_status.stepIndex += stepAdjust(code);
-	if(_status.stepIndex < 0)
+	if (_status.stepIndex < 0)
 		_status.stepIndex = 0;
-	if(_status.stepIndex > 48)
+	if (_status.stepIndex > 48)
 		_status.stepIndex = 48;
 
 	return samp;
@@ -200,16 +200,16 @@
 	diff = (code & 0x08) ? -E : E;
 	samp = _status.last + diff;
 
-	if(samp < -32768)
+	if (samp < -32768)
 		samp = -32768;
-	else if(samp > 32767)
+	else if (samp > 32767)
 		samp = 32767;
 
 	_status.last = samp;
 	_status.stepIndex += stepAdjust(code);
-	if(_status.stepIndex < 0)
+	if (_status.stepIndex < 0)
 		_status.stepIndex = 0;
-	if(_status.stepIndex > 88)
+	if (_status.stepIndex > 88)
 		_status.stepIndex = 88;
 
 	return samp;

Index: mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.cpp,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -d -r1.190 -r1.191
--- mixer.cpp	4 Apr 2005 17:42:59 -0000	1.190
+++ mixer.cpp	8 May 2005 21:49:50 -0000	1.191
@@ -159,7 +159,7 @@
 			break;
 		}
 	}
-	if(index == -1) {
+	if (index == -1) {
 		warning("SoundMixer::out of mixer slots");
 		delete chan;
 		return;





More information about the Scummvm-git-logs mailing list