diff options
author | rubidium <rubidium@openttd.org> | 2007-01-10 18:56:51 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2007-01-10 18:56:51 +0000 |
commit | f35ed4bbc2b05f1b83476b60948d64375f77f1b4 (patch) | |
tree | 1a1c59c13ddb1d152052f3a3a0bcffe4fb531173 /src/mixer.cpp | |
parent | a332d10fd938f345fff18e5f4a662a58f692f734 (diff) | |
download | openttd-f35ed4bbc2b05f1b83476b60948d64375f77f1b4.tar.xz |
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
Diffstat (limited to 'src/mixer.cpp')
-rw-r--r-- | src/mixer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mixer.cpp b/src/mixer.cpp index 5b97afbf9..5037f771b 100644 --- a/src/mixer.cpp +++ b/src/mixer.cpp @@ -85,7 +85,7 @@ void MxMixSamples(void *buffer, uint samples) // Mix each channel for (mc = _channels; mc != endof(_channels); mc++) { if (mc->active) { - mix_int8_to_int16(mc, buffer, samples); + mix_int8_to_int16(mc, (int16*)buffer, samples); if (mc->samples_left == 0) MxCloseChannel(mc); } } |