summaryrefslogtreecommitdiff
path: root/src/mixer.cpp
diff options
context:
space:
mode:
authorfrosch <frosch@openttd.org>2008-07-15 17:13:50 +0000
committerfrosch <frosch@openttd.org>2008-07-15 17:13:50 +0000
commit33cd16981cc0e84505899d84b81dbe39a0deea74 (patch)
tree8158afc565ca7797e0fec87a692f27a15c6420aa /src/mixer.cpp
parent5b483718670e4175eebbe0971cdd17acfc3246a1 (diff)
downloadopenttd-33cd16981cc0e84505899d84b81dbe39a0deea74.tar.xz
(svn r13706) -Fix (r13695): Small typo.
Diffstat (limited to 'src/mixer.cpp')
-rw-r--r--src/mixer.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mixer.cpp b/src/mixer.cpp
index 3e9b1c5cb..41d49043a 100644
--- a/src/mixer.cpp
+++ b/src/mixer.cpp
@@ -60,14 +60,14 @@ static void mix_int8_to_int16(MixerChannel *sc, int16 *buffer, uint samples)
/* Special case when frac_speed is 0x10000 */
do {
buffer[0] = Clamp(buffer[0] + (*b * volume_left >> 8), -MAX_VOLUME, MAX_VOLUME);
- buffer[0] = Clamp(buffer[1] + (*b * volume_right >> 8), -MAX_VOLUME, MAX_VOLUME);
+ buffer[1] = Clamp(buffer[1] + (*b * volume_right >> 8), -MAX_VOLUME, MAX_VOLUME);
b++;
buffer += 2;
} while (--samples > 0);
} else {
do {
buffer[0] = Clamp(buffer[0] + (*b * volume_left >> 8), -MAX_VOLUME, MAX_VOLUME);
- buffer[0] = Clamp(buffer[1] + (*b * volume_right >> 8), -MAX_VOLUME, MAX_VOLUME);
+ buffer[1] = Clamp(buffer[1] + (*b * volume_right >> 8), -MAX_VOLUME, MAX_VOLUME);
buffer += 2;
frac_pos += frac_speed;
b += frac_pos >> 16;