Ticket #8414: GMRhythmMap.patch

scumm/imuse.cpp

@@ -1531 +1531 @@
                 mc = _player->getMidiDriver()->getPercussionChannel();
                 if (!mc)
                         return;
-                mc->volume(_vol_eff);
-//              mc->programChange(_bank);
+                static byte prev_vol_eff = 128;
+                if (_vol_eff != prev_vol_eff){
+                        mc->volume(_vol_eff);
+                        prev_vol_eff = _vol_eff;
+                }
+                if ((note < 35) && (!_player->_se->isNativeMT32()))
+                        note = Instrument::_gmRhythmMap[note];
+
                 mc->noteOn(note, velocity);
         }
 }

scumm/instrument.cpp

@@ -114 +115 @@
 //      { "trickle4  ", ??? }
 };
 
+const byte Instrument::_gmRhythmMap[35] = {
+          0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+          0,  0,  0,  0,  0,  0,  0,  0, 36, 37, 38, 39, 40, 41, 66, 47,
+         65, 48, 56}; 
+       // This emulates the percussion bank setup LEC used with the MT-32,
+       // where notes 24 - 34 were assigned instruments without reverb.
+       // It also fixes problems on GS devices that map sounds to these
+       // notes by default.
+
 class Instrument_Program : public InstrumentInternal {
 private:
         byte _program;

scumm/instrument.h

@@ -57 +57 @@
         Instrument() : _type (0), _instrument (0) { }
         ~Instrument() { delete _instrument; }
         static void nativeMT32 (bool native);
+        static const byte _gmRhythmMap[35];
 
         void clear();
         void copy_to (Instrument *dest) { if (_instrument) _instrument->copy_to (dest); else dest->clear(); }