diff options
| author | Johannes Schickel | 2011-07-11 21:51:24 +0200 |
|---|---|---|
| committer | Johannes Schickel | 2011-07-11 21:51:40 +0200 |
| commit | a8846d37d5e1e68602fa735e44fca6d0dd74dfcc (patch) | |
| tree | ae800001e5da422d887adc6368fc3df1e11716bb /engines/scumm/imuse/imuse_part.cpp | |
| parent | b8f6257dded94aeef9b8290801353ca19137c60a (diff) | |
| parent | 4ee228bb1692c4f77cea861cdea05282f4567591 (diff) | |
| download | scummvm-rg350-a8846d37d5e1e68602fa735e44fca6d0dd74dfcc.tar.gz scummvm-rg350-a8846d37d5e1e68602fa735e44fca6d0dd74dfcc.tar.bz2 scummvm-rg350-a8846d37d5e1e68602fa735e44fca6d0dd74dfcc.zip | |
Merge pull request #54 "SCUMM v5 PC Speaker driver".
Discussion can be found here: https://github.com/scummvm/scummvm/pull/54
Diffstat (limited to 'engines/scumm/imuse/imuse_part.cpp')
| -rw-r--r-- | engines/scumm/imuse/imuse_part.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/engines/scumm/imuse/imuse_part.cpp b/engines/scumm/imuse/imuse_part.cpp index 5df8407a96..53627f6a4a 100644 --- a/engines/scumm/imuse/imuse_part.cpp +++ b/engines/scumm/imuse/imuse_part.cpp @@ -194,13 +194,17 @@ void Part::set_onoff(bool on) { } void Part::set_instrument(byte * data) { - _instrument.adlib(data); + if (_se->_pcSpeaker) + _instrument.pcspk(data); + else + _instrument.adlib(data); + if (clearToTransmit()) _instrument.send(_mc); } void Part::load_global_instrument(byte slot) { - _player->_se->copyGlobalAdLibInstrument(slot, &_instrument); + _player->_se->copyGlobalInstrument(slot, &_instrument); if (clearToTransmit()) _instrument.send(_mc); } |