[Scummvm-cvs-logs] CVS: scummvm/sound mixer.cpp,1.72,1.73
Torbj?rn Andersson
eriktorbjorn at users.sourceforge.net
Wed Jul 23 06:18:01 CEST 2003
Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1:/tmp/cvs-serv27106
Modified Files:
mixer.cpp
Log Message:
Fixed regression in clamped_add_16() that kept it from clamping. This was
quite noticeable in the BASS floppy intro.
Of course, if it turns out that 'int' is also only 16 bits it still won't
work, but in that case we run into problems even before this function is
called.
Index: mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.cpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- mixer.cpp 17 Jul 2003 20:44:36 -0000 1.72
+++ mixer.cpp 23 Jul 2003 13:16:58 -0000 1.73
@@ -469,7 +469,7 @@
}
};
-static inline void clamped_add_16(int16& a, int16 b) {
+static inline void clamped_add_16(int16& a, int b) {
int val = a + b;
if (val > 32767)
More information about the Scummvm-git-logs
mailing list