shithub: choc

Info  •  Files  •  Log  •  Branches

Don't apply base note offset if the instrument is a fixed note
instrument. This should stop the ugly bleeping from the electric snare
on E1M2.

Subversion-branch: /branches/opl-branch
Subversion-revision: 1715

--- a/src/i_oplmusic.c

+++ b/src/i_oplmusic.c

@@ -701,10 +701,15 @@

     note = voice->note;

-    // Apply note offset:

+    // Apply note offset.

+    // Don't apply offset if the instrument is a fixed note instrument.

     gm_voice = &voice->current_instr->voices[voice->current_instr_voice];

-    note += (signed short) SHORT(gm_voice->base_note_offset);

+

+    if ((voice->current_instr->flags & GENMIDI_FLAG_FIXED) == 0)

+    {

+        note += (signed short) SHORT(gm_voice->base_note_offset);

+    }

     // Avoid possible overflow due to base note offset: