aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorJamieson Christian2002-12-18 13:53:52 +0000
committerJamieson Christian2002-12-18 13:53:52 +0000
commitd622df84d10b3ccf6950ab9f5acbdb85fa6ff2f1 (patch)
tree974a677d5685e00130cf8425157727b8d833ce5c /scumm
parenta8bbec66e7be530b58954a935551666d52c388f2 (diff)
downloadscummvm-rg350-d622df84d10b3ccf6950ab9f5acbdb85fa6ff2f1.tar.gz
scummvm-rg350-d622df84d10b3ccf6950ab9f5acbdb85fa6ff2f1.tar.bz2
scummvm-rg350-d622df84d10b3ccf6950ab9f5acbdb85fa6ff2f1.zip
Damn, I just fixed this a bit ago! *self-bonk*
svn-id: r6019
Diffstat (limited to 'scumm')
-rw-r--r--scumm/imuse.cpp1
-rw-r--r--scumm/instrument.cpp1
2 files changed, 1 insertions, 1 deletions
diff --git a/scumm/imuse.cpp b/scumm/imuse.cpp
index cb14d293ba..f387bf3a9f 100644
--- a/scumm/imuse.cpp
+++ b/scumm/imuse.cpp
@@ -2134,7 +2134,6 @@ void Player::parse_sysex(byte *p, uint len)
// Roland custom instrument definition.
part = get_part (p[0] & 0x0F);
if (part) {
- p[0] = part->_mc->getNumber();
part->_instrument.roland (p - 1);
part->changed (IMuseDriver::pcProgram);
}
diff --git a/scumm/instrument.cpp b/scumm/instrument.cpp
index 4d0270a0a7..e2b47dcef4 100644
--- a/scumm/instrument.cpp
+++ b/scumm/instrument.cpp
@@ -415,6 +415,7 @@ void Instrument_Roland::saveOrLoad (Serializer *s)
void Instrument_Roland::send (MidiChannel *mc)
{
if (NATIVE_MT32) { // if (mc->device()->mt32device()) {
+ _instrument.device_id = mc->getNumber();
mc->device()->sysEx ((byte *) &_instrument, sizeof (_instrument));
} else {
// Convert to a GM program change.