aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2012-11-20 03:26:43 +0100
committerJohannes Schickel2012-11-20 03:27:12 +0100
commitbe60a641bfb624c0b1b455c751790b28cdcdd45f (patch)
tree9ca0cca57a024b643d4e32105e3695c3676b0896
parent40ab5f878896006c0997626496511536fbb045b9 (diff)
downloadscummvm-rg350-be60a641bfb624c0b1b455c751790b28cdcdd45f.tar.gz
scummvm-rg350-be60a641bfb624c0b1b455c751790b28cdcdd45f.tar.bz2
scummvm-rg350-be60a641bfb624c0b1b455c751790b28cdcdd45f.zip
AUDIO: Slight cleanup and typo fix in S&M OPL3 code.
-rw-r--r--audio/softsynth/adlib.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/audio/softsynth/adlib.cpp b/audio/softsynth/adlib.cpp
index ba39e6d5e2..eb2f1093bb 100644
--- a/audio/softsynth/adlib.cpp
+++ b/audio/softsynth/adlib.cpp
@@ -2007,12 +2007,13 @@ void MidiDriver_ADLIB::adlibSetupChannelSecondary(int chan, const AdLibInstrumen
// The original uses the following (strange) behavior:
#if 0
if (instr->feedback | (pan > 64)) {
- adlibWriteSecondary((byte)chan + 0xC0, 0x10);
- } else {
adlibWriteSecondary((byte)chan + 0xC0, 0x20);
+ } else {
+ adlibWriteSecondary((byte)chan + 0xC0, 0x10);
}
-#endif
+#else
adlibWriteSecondary((byte)chan + 0xC0, instr->feedback | ((pan > 64) ? 0x20 : 0x10));
+#endif
}
void MidiDriver_ADLIB::mcInitStuff(AdLibVoice *voice, Struct10 *s10,