summaryrefslogtreecommitdiff
path: root/opl
diff options
context:
space:
mode:
authorSimon Howard2011-02-12 18:42:10 +0000
committerSimon Howard2011-02-12 18:42:10 +0000
commit516a7028994df6718289a7e3db4d07a45c95466b (patch)
treecf974cb4bd38b8e9d0101a41263b42b8c87e96c7 /opl
parenta15ba75736d15409876c1f0a44fffc99adf1c192 (diff)
parenta9996b41e954d85fde5ec5188bbf6a7f4df88011 (diff)
downloadchocolate-doom-516a7028994df6718289a7e3db4d07a45c95466b.tar.gz
chocolate-doom-516a7028994df6718289a7e3db4d07a45c95466b.tar.bz2
chocolate-doom-516a7028994df6718289a7e3db4d07a45c95466b.zip
Merge from raven-branch. FEATURE_MULTIPLAYER has been disabled
temporarily until the netgame changes on raven-branch are finished. Subversion-branch: /branches/strife-branch Subversion-revision: 2259
Diffstat (limited to 'opl')
-rw-r--r--opl/opl_sdl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/opl/opl_sdl.c b/opl/opl_sdl.c
index f6a3b229..5059fb5e 100644
--- a/opl/opl_sdl.c
+++ b/opl/opl_sdl.c
@@ -176,8 +176,8 @@ static void FillBuffer(int16_t *buffer, unsigned int nsamples)
for (i=0; i<nsamples; ++i)
{
- buffer[i * 2] = (int16_t) (mix_buffer[i] * 2);
- buffer[i * 2 + 1] = (int16_t) (mix_buffer[i] * 2);
+ buffer[i * 2] = (int16_t) mix_buffer[i];
+ buffer[i * 2 + 1] = (int16_t) mix_buffer[i];
}
}