diff options
| author | Torbjörn Andersson | 2003-07-23 13:16:58 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2003-07-23 13:16:58 +0000 |
| commit | a327f805acdb8bc6b9619c57bea09abc3fd360a6 (patch) | |
| tree | b33d4befcc019ff326d85d602089dd367ef88cbf | |
| parent | dad1586dafd07d290ec9036049273d702ea0d288 (diff) | |
| download | scummvm-rg350-a327f805acdb8bc6b9619c57bea09abc3fd360a6.tar.gz scummvm-rg350-a327f805acdb8bc6b9619c57bea09abc3fd360a6.tar.bz2 scummvm-rg350-a327f805acdb8bc6b9619c57bea09abc3fd360a6.zip | |
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.
svn-id: r9145
| -rw-r--r-- | sound/mixer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/mixer.cpp b/sound/mixer.cpp index 3c47b6fc59..3ea8951c15 100644 --- a/sound/mixer.cpp +++ b/sound/mixer.cpp @@ -469,7 +469,7 @@ protected: } }; -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) |