Ticket #9100: fbear-dos-piano.diff

engines/scumm/imuse/imuse_player.cpp

@@ -73 +73 @@
         _transpose(0),
         _detune(0),
         _vol_eff(0),
+        _base_note(0),
         _track_index(0),
         _loop_to_beat(0),
         _loop_from_beat(0),
@@ -252 +253 @@
                 break;
 
         case 0x9: // Key On
+                param1 += _base_note;
                 if (!_scanning) {
                         if (_isMT32 && !_se->isNativeMT32())
                                 param2 = (((param2 * 3) >> 2) + 32) & 0x7F;
@@ -562 +564 @@
         part->set_transpose(b);
 }
 
+void Player::setBaseNote(int baseNote) {
+        _base_note = baseNote;
+}
+
 bool Player::jump(uint track, uint beat, uint tick) {
         if (!_parser)
                 return false;

engines/scumm/imuse/imuse.cpp

@@ -443 +443 @@
                         _tempoFactor = value;
                 break;
 
+        case IMuse::PROP_NOTE_BASE:
+                _noteBase = value;
+                break;
+
         case IMuse::PROP_NATIVE_MT32:
                 _native_mt32 = (value > 0);
                 Instrument::nativeMT32(_native_mt32);
@@ -603 +607 @@
         if (!player)
                 return false;
 
+        player->setBaseNote(_noteBase);
+        _noteBase = 0;
+
         // WORKAROUND: This is to work around a problem at the Dino Bungie
         // Memorial.
         //

engines/scumm/imuse/imuse_internal.h

@@ -186 +186 @@
         int8 _transpose;
         int8 _detune;
         byte _vol_eff;
+        int _base_note;
 
         uint _track_index;
         uint _loop_to_beat;
@@ -275 +276 @@
         void setPriority(int pri);
         void setSpeed(byte speed);
         int setTranspose(byte relative, int b);
+        void setBaseNote(int baseNote);
         int setVolume(byte vol);
         bool startSound(int sound, MidiDriver *midi, bool passThrough);
         int getMusicTimer() const;
@@ -419 +421 @@
         bool _initialized;
 
         int _tempoFactor;
+        int _noteBase;
 
         int  _player_limit;       // Limits how many simultaneous music tracks are played
         bool _recycle_players;    // Can we stop a player in order to start another one?

engines/scumm/imuse/imuse.h

@@ -59 +59 @@
                 PROP_LIMIT_PLAYERS,
                 PROP_RECYCLE_PLAYERS,
                 PROP_DIRECT_PASSTHROUGH,
-                PROP_GAME_ID
+                PROP_GAME_ID,
+                PROP_NOTE_BASE
         };
 
 public:

engines/scumm/scumm.h

@@ -1383 +1383 @@
 
         // Exists both in V7 and in V72HE:
         byte VAR_NUM_GLOBAL_OBJS;
+        byte VAR_MIDI_NOTE;                     // Fatty Bear's Birthday Surprise
 };
 
 } // End of namespace Scumm

engines/scumm/he/sound_he.cpp

@@ -741 +741 @@
         }
         else if (READ_BE_UINT32(ptr) == MKID_BE('MIDI')) {
                 if (_vm->_imuse) {
+                        int noteBase = _vm->VAR(_vm->VAR_MIDI_NOTE);
+                        if (noteBase)
+                                noteBase -= 442;
                         _vm->_imuse->stopSound(_currentMusic);
                         _currentMusic = soundID;
+                        _vm->_imuse->property(IMuse::PROP_NOTE_BASE, noteBase);
                         _vm->_imuse->startSound(soundID);
                 }
         }

engines/scumm/he/intern_he.h

@@ -68 +68 @@
 protected:
         virtual void setupOpcodes();
 
+        virtual void setupScummVars();
+
         virtual void saveOrLoad(Serializer *s);
 
         void localizeArray(int slot, byte scriptSlot);

engines/scumm/vars.cpp

@@ -206 +206 @@
         }
 }
 
-void ScummEngine_v70he::setupScummVars() {
+void ScummEngine_v60he::setupScummVars() {
         ScummEngine_v6::setupScummVars();
 
+        VAR_MIDI_NOTE = 173;
+}
+
+void ScummEngine_v70he::setupScummVars() {
+        ScummEngine_v60he::setupScummVars();
+
         VAR_CURRENTDRIVE = 0xFF;
         VAR_MUSIC_TIMER = 0xFF;