Ticket #9100: fbear-dos-piano2.diff

engines/scumm/imuse/imuse_player.cpp

@@ -72 +72 @@
         _pan(0),
         _transpose(0),
         _detune(0),
+        _offset_note(0),
         _vol_eff(0),
         _track_index(0),
         _loop_to_beat(0),
@@ -165 +166 @@
         _active = false;
         _midi = NULL;
         _id = 0;
+        _offset_note = 0;
 }
 
 void Player::hook_clear() {
@@ -252 +254 @@
                 break;
 
         case 0x9: // Key On
+                param1 += _offset_note;
                 if (!_scanning) {
                         if (_isMT32 && !_se->isNativeMT32())
                                 param2 = (((param2 * 3) >> 2) + 32) & 0x7F;
@@ -666 +669 @@
         }
 }
 
+void Player::setOffsetNote(int offset) {
+        _offset_note = offset;
+}
+
 int Player::scan(uint totrack, uint tobeat, uint totick) {
         if (!_active || !_parser)
                 return -1;

engines/scumm/imuse/imuse.cpp

@@ -491 +491 @@
         _sysex = handler;
 }
 
+void IMuseInternal::startHESound(int sound, int offset) {
+        Common::StackLock lock(_mutex, "IMuseInternal::startSound()");
+        startSound_internal(sound, offset);
+}
 
-
 ////////////////////////////////////////
 //
 // MusicEngine interface methods
@@ -559 +562 @@
 //
 ////////////////////////////////////////
 
-bool IMuseInternal::startSound_internal(int sound) {
+bool IMuseInternal::startSound_internal(int sound, int offset) {
         // Do not start a sound if it is already set to start on an ImTrigger
         // event. This fixes carnival music problems where a sound has been set
         // to trigger at the right time, but then is started up immediately
@@ -632 +635 @@
                 ImClearTrigger(81, 1);
 
         player->clear();
+        player->setOffsetNote(offset);
         return player->startSound(sound, driver, _direct_passthrough);
 }
 

engines/scumm/imuse/imuse_internal.h

@@ -185 +185 @@
         int8 _pan;
         int8 _transpose;
         int8 _detune;
+        int _offset_note;
         byte _vol_eff;
 
         uint _track_index;
@@ -270 +271 @@
         void saveLoadWithSerializer(Serializer *ser);
         int setHook(byte cls, byte value, byte chan) { return _hook.set(cls, value, chan); }
         void setDetune(int detune);
+        void setOffsetNote(int offset);
         bool setLoop(uint count, uint tobeat, uint totick, uint frombeat, uint fromtick);
         void setPan(int pan);
         void setPriority(int pri);
@@ -507 +509 @@
 
 protected:
         // Internal mutex-free versions of the IMuse and MusicEngine methods.
-        bool startSound_internal(int sound);
+        bool startSound_internal(int sound, int offset = 0);
         int stopSound_internal(int sound);
         int stopAllSounds_internal();
         int getSoundStatus_internal(int sound, bool ignoreFadeouts) const;
@@ -525 +527 @@
         virtual void addSysexHandler(byte mfgID, sysexfunc handler);
 
 public:
+        void startHESound(int sound, int offset);
+
         // MusicEngine interface
         void setMusicVolume(int vol);
         void startSound(int sound);

engines/scumm/imuse/imuse.h

@@ -74 +74 @@
         virtual void addSysexHandler (byte mfgID, sysexfunc handler) = 0;
 
 public:
+        virtual void startHESound(int sound, int offset) = 0;
+
         // MusicEngine base class methods.
         // Not actually redefined here because none are implemented.
 

engines/scumm/he/sound_he.cpp

@@ -741 +741 @@
         }
         else if (READ_BE_UINT32(ptr) == MKID_BE('MIDI')) {
                 if (_vm->_imuse) {
+                        // This is used in the DOS version of Fatty Bear's
+                        // Birthday Surprise to change the note on the piano
+                        // when not using a digitized instrument.
                         _vm->_imuse->stopSound(_currentMusic);
                         _currentMusic = soundID;
-                        _vm->_imuse->startSound(soundID);
+                        _vm->_imuse->startHESound(soundID, heOffset);
                 }
         }
 }