aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorMax Horn2009-05-26 15:46:54 +0000
committerMax Horn2009-05-26 15:46:54 +0000
commit50157fbca9e442d9c376f68edb1a9c73ae91b4b1 (patch)
tree498df398698d9a6eeaf0edf0be168507513d302a /engines
parent099a29b6bf5dff9a02100aaff2b70146dc1de674 (diff)
downloadscummvm-rg350-50157fbca9e442d9c376f68edb1a9c73ae91b4b1.tar.gz
scummvm-rg350-50157fbca9e442d9c376f68edb1a9c73ae91b4b1.tar.bz2
scummvm-rg350-50157fbca9e442d9c376f68edb1a9c73ae91b4b1.zip
SCI: Undo commit #40917 (SongIteratorChannel::resetSynthChannels now again does something)
svn-id: r40921
Diffstat (limited to 'engines')
-rw-r--r--engines/sci/sfx/iterator.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/engines/sci/sfx/iterator.cpp b/engines/sci/sfx/iterator.cpp
index ccf9b29474..599beb0186 100644
--- a/engines/sci/sfx/iterator.cpp
+++ b/engines/sci/sfx/iterator.cpp
@@ -126,9 +126,9 @@ void SongIteratorChannel::init(int id_, int offset_, int end_) {
saw_notes = 0;
}
+extern SfxPlayer *player; // FIXME
+
void SongIteratorChannel::resetSynthChannels() {
-#if 0
- extern SfxPlayer *player; // FIXME
byte buf[5];
for (int i = 0; i < MIDI_CHANNELS; i++) {
@@ -147,7 +147,6 @@ void SongIteratorChannel::resetSynthChannels() {
/* TODO: Reset other controls? */
}
}
-#endif
}
static int _parse_sci_midi_command(BaseSongIterator *self, byte *buf,